sh_eth: remove mask fields from 'struct bb_info'
The MDIO control bits are always mapped to the same bits of the same register
(PIR), so there's no need to store their masks in the 'struct bb_info'...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 2406ad4..a2fb45a 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1013,10 +1013,6 @@
void (*set_gate)(void *addr);
struct mdiobb_ctrl ctrl;
void *addr;
- u32 mmd_msk;/* MMD */
- u32 mdo_msk;
- u32 mdi_msk;
- u32 mdc_msk;
};
/* PHY bit set */
@@ -1046,9 +1042,9 @@
bitbang->set_gate(bitbang->addr);
if (bit)
- bb_set(bitbang->addr, bitbang->mmd_msk);
+ bb_set(bitbang->addr, PIR_MMD);
else
- bb_clr(bitbang->addr, bitbang->mmd_msk);
+ bb_clr(bitbang->addr, PIR_MMD);
}
/* Set bit data*/
@@ -1060,9 +1056,9 @@
bitbang->set_gate(bitbang->addr);
if (bit)
- bb_set(bitbang->addr, bitbang->mdo_msk);
+ bb_set(bitbang->addr, PIR_MDO);
else
- bb_clr(bitbang->addr, bitbang->mdo_msk);
+ bb_clr(bitbang->addr, PIR_MDO);
}
/* Get bit data*/
@@ -1073,7 +1069,7 @@
if (bitbang->set_gate)
bitbang->set_gate(bitbang->addr);
- return bb_read(bitbang->addr, bitbang->mdi_msk);
+ return bb_read(bitbang->addr, PIR_MDI);
}
/* MDC pin control */
@@ -1085,9 +1081,9 @@
bitbang->set_gate(bitbang->addr);
if (bit)
- bb_set(bitbang->addr, bitbang->mdc_msk);
+ bb_set(bitbang->addr, PIR_MDC);
else
- bb_clr(bitbang->addr, bitbang->mdc_msk);
+ bb_clr(bitbang->addr, PIR_MDC);
}
/* mdio bus control struct */
@@ -2899,10 +2895,6 @@
/* bitbang init */
bitbang->addr = mdp->addr + mdp->reg_offset[PIR];
bitbang->set_gate = pd->set_mdio_gate;
- bitbang->mdi_msk = PIR_MDI;
- bitbang->mdo_msk = PIR_MDO;
- bitbang->mmd_msk = PIR_MMD;
- bitbang->mdc_msk = PIR_MDC;
bitbang->ctrl.ops = &bb_ops;
/* MII controller setting */