ravb: remove APSR_DM

According to the R-Car Series, 3rd Generation User's Manual: Hardware,
Rev. 1.50, there's no APSR.DM field, instead there are 2 independent
RX/TX clock internal delay bits. Follow the suit: remove #define APSR_DM
and rename #define's APSR_DM_{R|T}DM to APSR_{R|T}DM.

While at it, do several more things to the declaration of *enum* APSR_BIT:
- remove superfluous indentation;
- annotate APSR_MEMS as undocumented;
- annotate APSR as R-Car Gen3 only.

Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 7453b17a37a2c8d0f10ab0387ab94464a65d4620..8fd5f37e4d30544275fe5a5279b11a0d1cef53b5 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -241,13 +241,12 @@ enum ESR_BIT {
        ESR_EIL         = 0x00001000,
 };
 
-/* APSR */
+/* APSR (R-Car Gen3 only) */
 enum APSR_BIT {
-       APSR_MEMS               = 0x00000002,
-       APSR_CMSW               = 0x00000010,
-       APSR_DM                 = 0x00006000,   /* Undocumented? */
-       APSR_DM_RDM             = 0x00002000,
-       APSR_DM_TDM             = 0x00004000,
+       APSR_MEMS       = 0x00000002,   /* Undocumented */
+       APSR_CMSW       = 0x00000010,
+       APSR_RDM        = 0x00002000,
+       APSR_TDM        = 0x00004000,
 };
 
 /* RCR */

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index bd30505fbc57a6e31ddb431694cda784246acf9e..eb0c03bdb12d514ab514596db134a09aa2701182 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2034,10 +2034,10 @@ static void ravb_set_delay_mode(struct net_device *ndev)
        u32 set = 0;
 
        if (priv->rxcidm)
-               set |= APSR_DM_RDM;
+               set |= APSR_RDM;
        if (priv->txcidm)
-               set |= APSR_DM_TDM;
-       ravb_modify(ndev, APSR, APSR_DM, set);
+               set |= APSR_TDM;
+       ravb_modify(ndev, APSR, APSR_RDM | APSR_TDM, set);
 }
 
 static int ravb_probe(struct platform_device *pdev)