Skip to content

Commit

Permalink
staging/rtl8187se: Remove temporary variable for return value
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Feb 15, 2013
1 parent 2c370d9 commit aa341b6
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions drivers/staging/rtl8187se/r8185b_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit aa341b6

Please sign in to comment.