summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/phy_lcn.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-07-31 23:59:43 +0400
committerJohn W. Linville <linville@tuxdriver.com>2014-08-26 00:00:42 +0400
commitd342b95dd735014a590f9051b1ba227eb54ca8f6 (patch)
tree2be91cea3fcb03b371882188b50236eac8c51820 /drivers/net/wireless/b43/phy_lcn.c
parent6247d2aa5188ac0ace33d8390341075c04107218 (diff)
downloadlinux-d342b95dd735014a590f9051b1ba227eb54ca8f6.tar.xz
b43: don't duplicate common PHY read/write ops
Most of the PHYs use the same way of accessing registers, so move that code to the shared place. An exception is G-PHY which sometimes access A-PHY regs and requires special handling. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/phy_lcn.c')
-rw-r--r--drivers/net/wireless/b43/phy_lcn.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/b43/phy_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index e76bbdf3247e..bf29c3eb0095 100644
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -810,18 +810,6 @@ static void b43_phy_lcn_op_adjust_txpower(struct b43_wldev *dev)
* R/W ops.
**************************************************/
-static u16 b43_phy_lcn_op_read(struct b43_wldev *dev, u16 reg)
-{
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_PHY_DATA);
-}
-
-static void b43_phy_lcn_op_write(struct b43_wldev *dev, u16 reg, u16 value)
-{
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_write16(dev, B43_MMIO_PHY_DATA, value);
-}
-
static void b43_phy_lcn_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
u16 set)
{
@@ -855,8 +843,6 @@ const struct b43_phy_operations b43_phyops_lcn = {
.free = b43_phy_lcn_op_free,
.prepare_structs = b43_phy_lcn_op_prepare_structs,
.init = b43_phy_lcn_op_init,
- .phy_read = b43_phy_lcn_op_read,
- .phy_write = b43_phy_lcn_op_write,
.phy_maskset = b43_phy_lcn_op_maskset,
.radio_read = b43_phy_lcn_op_radio_read,
.radio_write = b43_phy_lcn_op_radio_write,