ucc_geth: use correct UCCE macros

The UCC Event Register (UCCE) already has unambigous macro definitions in qe.h,
so we should not be defining our own in the UCC Ethernet driver.

Removed unused local variable 'dev' from ucc_geth_poll(), which fixes
a warning caused by commit 908a7a16b852ffd618a9127be8d62432182d81b4
("net: Remove unused netdev arg from some NAPI interfaces.").

Replaced in_be/out_be pairs with setbits32 or clrbits32, where applicable.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 68 insertions, 174 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 7d5a1303e30d..11441225bf41 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -442,40 +442,30 @@ static void magic_packet_detection_enable(struct ucc_geth_private *ugeth)
 {
         struct ucc_fast_private *uccf;
         struct ucc_geth __iomem *ug_regs;
-        u32 maccfg2, uccm;
 
         uccf = ugeth->uccf;
         ug_regs = ugeth->ug_regs;
 
         /* Enable interrupts for magic packet detection */
-        uccm = in_be32(uccf->p_uccm);
-        uccm |= UCCE_MPD;
-        out_be32(uccf->p_uccm, uccm);
+        setbits32(uccf->p_uccm, UCC_GETH_UCCE_MPD);
 
         /* Enable magic packet detection */
-        maccfg2 = in_be32(&ug_regs->maccfg2);
-        maccfg2 |= MACCFG2_MPE;
-        out_be32(&ug_regs->maccfg2, maccfg2);
+        setbits32(&ug_regs->maccfg2, MACCFG2_MPE);
 }
 
 static void magic_packet_detection_disable(struct ucc_geth_private *ugeth)
 {
         struct ucc_fast_private *uccf;
         struct ucc_geth __iomem *ug_regs;
-        u32 maccfg2, uccm;
 
         uccf = ugeth->uccf;
         ug_regs = ugeth->ug_regs;
 
         /* Disable interrupts for magic packet detection */
-        uccm = in_be32(uccf->p_uccm);
-        uccm &= ~UCCE_MPD;
-        out_be32(uccf->p_uccm, uccm);
+        clrbits32(uccf->p_uccm, UCC_GETH_UCCE_MPD);
 
         /* Disable magic packet detection */
-        maccfg2 = in_be32(&ug_regs->maccfg2);
-        maccfg2 &= ~MACCFG2_MPE;
-        out_be32(&ug_regs->maccfg2, maccfg2);
+        clrbits32(&ug_regs->maccfg2, MACCFG2_MPE);
 }
 #endif /* MAGIC_PACKET */
 
@@ -585,7 +575,8 @@ static void get_statistics(struct ucc_geth_private *ugeth,
 
         /* Hardware only if user handed pointer and driver actually
         gathers hardware statistics */
-        if (hardware_statistics && (in_be32(&uf_regs->upsmr) & UPSMR_HSE)) {
+        if (hardware_statistics &&
+            (in_be32(&uf_regs->upsmr) & UCC_GETH_UPSMR_HSE)) {
                 hardware_statistics->tx64 = in_be32(&ug_regs->tx64);
                 hardware_statistics->tx127 = in_be32(&ug_regs->tx127);
                 hardware_statistics->tx255 = in_be32(&ug_regs->tx255);
@@ -1181,9 +1172,7 @@ int init_flow_control_params(u32 automatic_flow_control_mode,
         out_be32(uempr_register, value);
 
         /* Set UPSMR register */
-        value = in_be32(upsmr_register);
-        value |= automatic_flow_control_mode;
-        out_be32(upsmr_register, value);
+        setbits32(upsmr_register, automatic_flow_control_mode);
 
         value = in_be32(maccfg1_register);
         if (rx_flow_control_enable)
@@ -1200,14 +1189,11 @@ static int init_hw_statistics_gathering_mode(int enable_hardware_statistics,
                                              u32 __iomem *upsmr_register,
                                              u16 __iomem *uescr_register)
 {
-        u32 upsmr_value = 0;
         u16 uescr_value = 0;
+
         /* Enable hardware statistics gathering if requested */
-        if (enable_hardware_statistics) {
-                upsmr_value = in_be32(upsmr_register);
-                upsmr_value |= UPSMR_HSE;
-                out_be32(upsmr_register, upsmr_value);
-        }
+        if (enable_hardware_statistics)
+                setbits32(upsmr_register, UCC_GETH_UPSMR_HSE);
 
         /* Clear hardware statistics counters */
         uescr_value = in_be16(uescr_register);
@@ -1233,23 +1219,17 @@ static int init_firmware_statistics_gathering_mode(int
 {
         /* Note: this function does not check if */
         /* the parameters it receives are NULL   */
-        u16 temoder_value;
-        u32 remoder_value;
 
         if (enable_tx_firmware_statistics) {
                 out_be32(tx_rmon_base_ptr,
                          tx_firmware_statistics_structure_address);
-                temoder_value = in_be16(temoder_register);
-                temoder_value |= TEMODER_TX_RMON_STATISTICS_ENABLE;
-                out_be16(temoder_register, temoder_value);
+                setbits16(temoder_register, TEMODER_TX_RMON_STATISTICS_ENABLE);
         }
 
         if (enable_rx_firmware_statistics) {
                 out_be32(rx_rmon_base_ptr,
                          rx_firmware_statistics_structure_address);
-                remoder_value = in_be32(remoder_register);
-                remoder_value |= REMODER_RX_RMON_STATISTICS_ENABLE;
-                out_be32(remoder_register, remoder_value);
+                setbits32(remoder_register, REMODER_RX_RMON_STATISTICS_ENABLE);
         }
 
         return 0;
@@ -1316,15 +1296,12 @@ static int init_check_frame_length_mode(int length_check,
 static int init_preamble_length(u8 preamble_length,
                                 u32 __iomem *maccfg2_register)
 {
-        u32 value = 0;
-
         if ((preamble_length < 3) || (preamble_length > 7))
                 return -EINVAL;
 
-        value = in_be32(maccfg2_register);
-        value &= ~MACCFG2_PREL_MASK;
-        value |= (preamble_length << MACCFG2_PREL_SHIFT);
-        out_be32(maccfg2_register, value);
+        clrsetbits_be32(maccfg2_register, MACCFG2_PREL_MASK,
+                        preamble_length << MACCFG2_PREL_SHIFT);
+
         return 0;
 }
 
@@ -1337,19 +1314,19 @@ static int init_rx_parameters(int reject_broadcast,
         value = in_be32(upsmr_register);
 
         if (reject_broadcast)
-                value |= UPSMR_BRO;
+                value |= UCC_GETH_UPSMR_BRO;
         else
-                value &= ~UPSMR_BRO;
+                value &= ~UCC_GETH_UPSMR_BRO;
 
         if (receive_short_frames)
-                value |= UPSMR_RSH;
+                value |= UCC_GETH_UPSMR_RSH;
         else
-                value &= ~UPSMR_RSH;
+                value &= ~UCC_GETH_UPSMR_RSH;
 
         if (promiscuous)
-                value |= UPSMR_PRO;
+                value |= UCC_GETH_UPSMR_PRO;
         else
-                value &= ~UPSMR_PRO;
+                value &= ~UCC_GETH_UPSMR_PRO;
 
         out_be32(upsmr_register, value);
 
@@ -1410,26 +1387,27 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
 
         /*                    Set UPSMR                      */
         upsmr = in_be32(&uf_regs->upsmr);
-        upsmr &= ~(UPSMR_RPM | UPSMR_R10M | UPSMR_TBIM | UPSMR_RMM);
+        upsmr &= ~(UCC_GETH_UPSMR_RPM | UCC_GETH_UPSMR_R10M |
+                   UCC_GETH_UPSMR_TBIM | UCC_GETH_UPSMR_RMM);
         if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {