diff options
| author |   Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-07-19 19:28:26 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-22 21:26:21 -0700 |
| commit | d8ae1967694aca45edf9a9d559aa904c433b4bbe (patch) | |
| tree | e4115d8860a975395ed1d901609a6dd1e4732911 /drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | |
| parent | staging: rtl8192e: Rename rtl819x_update_rxsignalstatistics8190pci (diff) | |
| download | linux-dev-d8ae1967694aca45edf9a9d559aa904c433b4bbe.tar.xz linux-dev-d8ae1967694aca45edf9a9d559aa904c433b4bbe.zip | |
staging: rtl8192e: Rename write_nic_byte
Use naming schema found in other rtlwifi devices.
Rename write_nic_byte to rtl92e_writeb.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c index 61d462063fa7..f58534609691 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c @@ -28,12 +28,13 @@ static void eprom_cs(struct net_device *dev, short bit) { if (bit) - write_nic_byte(dev, EPROM_CMD, - (1 << EPROM_CS_SHIFT) | - rtl92e_readb(dev, EPROM_CMD)); + rtl92e_writeb(dev, EPROM_CMD, + (1 << EPROM_CS_SHIFT) | + rtl92e_readb(dev, EPROM_CMD)); else - write_nic_byte(dev, EPROM_CMD, rtl92e_readb(dev, EPROM_CMD) - & ~(1<<EPROM_CS_SHIFT)); + rtl92e_writeb(dev, EPROM_CMD, + rtl92e_readb(dev, EPROM_CMD) & + ~(1<<EPROM_CS_SHIFT)); udelay(EPROM_DELAY); } @@ -41,11 +42,11 @@ static void eprom_cs(struct net_device *dev, short bit) static void eprom_ck_cycle(struct net_device *dev) { - write_nic_byte(dev, EPROM_CMD, - (1<<EPROM_CK_SHIFT) | rtl92e_readb(dev, EPROM_CMD)); + rtl92e_writeb(dev, EPROM_CMD, + (1<<EPROM_CK_SHIFT) | rtl92e_readb(dev, EPROM_CMD)); udelay(EPROM_DELAY); - write_nic_byte(dev, EPROM_CMD, - rtl92e_readb(dev, EPROM_CMD) & ~(1<<EPROM_CK_SHIFT)); + rtl92e_writeb(dev, EPROM_CMD, + rtl92e_readb(dev, EPROM_CMD) & ~(1<<EPROM_CK_SHIFT)); udelay(EPROM_DELAY); } @@ -53,11 +54,12 @@ static void eprom_ck_cycle(struct net_device *dev) static void eprom_w(struct net_device *dev, short bit) { if (bit) - write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | - rtl92e_readb(dev, EPROM_CMD)); + rtl92e_writeb(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | + rtl92e_readb(dev, EPROM_CMD)); else - write_nic_byte(dev, EPROM_CMD, rtl92e_readb(dev, EPROM_CMD) - & ~(1<<EPROM_W_SHIFT)); + rtl92e_writeb(dev, EPROM_CMD, + rtl92e_readb(dev, EPROM_CMD) & + ~(1<<EPROM_W_SHIFT)); udelay(EPROM_DELAY); } @@ -95,8 +97,8 @@ u32 eprom_read(struct net_device *dev, u32 addr) u32 ret; ret = 0; - write_nic_byte(dev, EPROM_CMD, - (EPROM_CMD_PROGRAM << EPROM_CMD_OPERATING_MODE_SHIFT)); + rtl92e_writeb(dev, EPROM_CMD, + (EPROM_CMD_PROGRAM << EPROM_CMD_OPERATING_MODE_SHIFT)); udelay(EPROM_DELAY); if (priv->epromtype == EEPROM_93C56) { @@ -133,7 +135,7 @@ u32 eprom_read(struct net_device *dev, u32 addr) eprom_cs(dev, 0); eprom_ck_cycle(dev); - write_nic_byte(dev, EPROM_CMD, - (EPROM_CMD_NORMAL<<EPROM_CMD_OPERATING_MODE_SHIFT)); + rtl92e_writeb(dev, EPROM_CMD, + (EPROM_CMD_NORMAL<<EPROM_CMD_OPERATING_MODE_SHIFT)); return ret; } |