staging/rtl8187se: Remove temporary variable for return value

The simple PlatformIORead1Byte function doesn't need to store its return
value in a temporary variable; rather simply return the value directly.

By moving the function to the top we can also get rid of the forward
declaration.

The wrapper functions could be easily replaced by direct calls to
read_nic_byte but is kept for readability.

Since this functions is local only we can mark it as static.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index a3b836cf775b5613ae35288f5d151d038b6d6493..1dfa78e137c0a26d454b49312da7e05d5c997440 100644 (file)
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -115,6 +115,11 @@ static u8 OFDM_CONFIG[]    = {
         *---------------------------------------------------------------
         */
 
+static u8 PlatformIORead1Byte(struct net_device *dev, u32 offset)
+{
+       return read_nic_byte(dev, offset);
+}
+
 void PlatformIOWrite1Byte(struct net_device *dev, u32 offset, u8 data)
 {
        write_nic_byte(dev, offset, data);
@@ -127,8 +132,6 @@ void PlatformIOWrite2Byte(struct net_device *dev, u32 offset, u16 data)
        read_nic_word(dev, offset); /* To make sure write operation is completed, 2005.11.09, by rcnjko. */
 }
 
-u8 PlatformIORead1Byte(struct net_device *dev, u32 offset);
-
 void PlatformIOWrite4Byte(struct net_device *dev, u32 offset, u32 data)
 {
        if (offset == PhyAddr) {
@@ -172,16 +175,6 @@ void PlatformIOWrite4Byte(struct net_device *dev, u32 offset, u32 data)
        }
 }
 
-u8 PlatformIORead1Byte(struct net_device *dev, u32 offset)
-{
-       u8      data = 0;
-
-       data = read_nic_byte(dev, offset);
-
-
-       return data;
-}
-
 u16 PlatformIORead2Byte(struct net_device *dev, u32 offset)
 {
        u16     data = 0;