From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758564Ab3BMDBM (ORCPT ); Tue, 12 Feb 2013 22:01:12 -0500 Received: from mout.gmx.net ([212.227.17.20]:51865 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751263Ab3BMDBK (ORCPT ); Tue, 12 Feb 2013 22:01:10 -0500 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX18tnWg5GHYtSaCbGPWp2QtsWb3iX2vaKuEqSfJYyl qiEq5lyhtH60JL From: Peter Huewe To: Greg Kroah-Hartman Cc: Peter Huewe , Andrew Miller , Maxim Mikityanskiy , YAMANE Toshiaki , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/9] staging/rtl8187se: Reuse ReadBBPortUchar to avoid duplicated code Date: Wed, 13 Feb 2013 04:05:22 +0100 Message-Id: <1360724726-2997-5-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1360724302-2794-4-git-send-email-peterhuewe@gmx.de> References: <1360724302-2794-4-git-send-email-peterhuewe@gmx.de> X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org WriteBBPortUchar reimplements ReadBBPortUchar in its body, so we can remove the duplicated code by calling ReadBBPortUchar directly. Unfortunately we have to move ReadBBPortUchar around; while at it we can also get rid of the temporary variable for the return value. Also we can remove the local variables UCharData and RegisterContent in WriteBBPortUchar as they are not used / without effect. Both functions are only 'local' so we can mark them as static. Signed-off-by: Peter Huewe --- drivers/staging/rtl8187se/r8185b_init.c | 30 +++++++----------------------- 1 files changed, 7 insertions(+), 23 deletions(-) diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c index 1e54ead..a3b836c 100644 --- a/drivers/staging/rtl8187se/r8185b_init.c +++ b/drivers/staging/rtl8187se/r8185b_init.c @@ -287,35 +287,19 @@ u16 RF_ReadReg(struct net_device *dev, u8 offset) return reg; } +static u8 ReadBBPortUchar(struct net_device *dev, u32 addr) +{ + PlatformIOWrite4Byte(dev, PhyAddr, addr & 0xffffff7f); + return PlatformIORead1Byte(dev, PhyDataR); +} /* by Owen on 04/07/14 for writing BB register successfully */ -void WriteBBPortUchar(struct net_device *dev, u32 Data) +static void WriteBBPortUchar(struct net_device *dev, u32 Data) { - /* u8 TimeoutCounter; */ - u8 RegisterContent; - u8 UCharData; - - UCharData = (u8)((Data & 0x0000ff00) >> 8); PlatformIOWrite4Byte(dev, PhyAddr, Data); - /* for(TimeoutCounter = 10; TimeoutCounter > 0; TimeoutCounter--) */ - { - PlatformIOWrite4Byte(dev, PhyAddr, Data & 0xffffff7f); - RegisterContent = PlatformIORead1Byte(dev, PhyDataR); - /*if(UCharData == RegisterContent) */ - /* break; */ - } + ReadBBPortUchar(dev, Data); } -u8 ReadBBPortUchar(struct net_device *dev, u32 addr) -{ - /*u8 TimeoutCounter; */ - u8 RegisterContent; - - PlatformIOWrite4Byte(dev, PhyAddr, addr & 0xffffff7f); - RegisterContent = PlatformIORead1Byte(dev, PhyDataR); - - return RegisterContent; -} /* * Description: * Perform Antenna settings with antenna diversity on 87SE. -- 1.7.8.6