* [PATCH 1/2] ravb: kill useless *switch* defaults
2016-02-14 19:55 [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers Sergei Shtylyov
@ 2016-02-14 19:56 ` Sergei Shtylyov
2016-02-15 23:37 ` Simon Horman
2016-02-14 19:56 ` [PATCH 2/2] sh_eth: " Sergei Shtylyov
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2016-02-14 19:56 UTC (permalink / raw)
To: netdev; +Cc: linux-renesas-soc
The driver has the *default* case doing nothing in the *switch* statement
with an integer expression -- remove it.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
drivers/net/ethernet/renesas/ravb_main.c | 2 --
1 file changed, 2 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/ravb_main.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c
+++ net-next/drivers/net/ethernet/renesas/ravb_main.c
@@ -92,8 +92,6 @@ static void ravb_set_rate(struct net_dev
case 1000: /* 1000BASE */
ravb_write(ndev, GECMR_SPEED_1000, GECMR);
break;
- default:
- break;
}
}
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/2] sh_eth: kill useless *switch* defaults
2016-02-14 19:55 [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers Sergei Shtylyov
2016-02-14 19:56 ` [PATCH 1/2] ravb: kill useless *switch* defaults Sergei Shtylyov
@ 2016-02-14 19:56 ` Sergei Shtylyov
2016-02-15 23:38 ` Simon Horman
2016-02-17 20:30 ` [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers David Miller
2016-04-10 20:55 ` [PATCH] ravb: make ravb_ptp_interrupt() *void* Sergei Shtylyov
3 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2016-02-14 19:56 UTC (permalink / raw)
To: netdev; +Cc: linux-renesas-soc
The driver often has the *default* cases doing nothing in the *switch*
statements with the integer expressions -- remove them.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
drivers/net/ethernet/renesas/sh_eth.c | 12 ------------
1 file changed, 12 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -500,8 +500,6 @@ static void sh_eth_set_rate_gether(struc
case 1000: /* 1000BASE */
sh_eth_write(ndev, GECMR_1000, GECMR);
break;
- default:
- break;
}
}
@@ -592,8 +590,6 @@ static void sh_eth_set_rate_r8a777x(stru
case 100:/* 100BASE */
sh_eth_modify(ndev, ECMR, ECMR_ELB, ECMR_ELB);
break;
- default:
- break;
}
}
@@ -658,8 +654,6 @@ static void sh_eth_set_rate_sh7724(struc
case 100:/* 100BASE */
sh_eth_modify(ndev, ECMR, ECMR_RTM, ECMR_RTM);
break;
- default:
- break;
}
}
@@ -698,8 +692,6 @@ static void sh_eth_set_rate_sh7757(struc
case 100:/* 100BASE */
sh_eth_write(ndev, 1, RTRATE);
break;
- default:
- break;
}
}
@@ -767,8 +759,6 @@ static void sh_eth_set_rate_giga(struct
case 1000: /* 1000BASE */
sh_eth_write(ndev, 0x00000020, GECMR);
break;
- default:
- break;
}
}
@@ -2917,8 +2907,6 @@ static const u16 *sh_eth_get_register_of
case SH_ETH_REG_FAST_SH3_SH2:
reg_offset = sh_eth_offset_fast_sh3_sh2;
break;
- default:
- break;
}
return reg_offset;
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers
2016-02-14 19:55 [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers Sergei Shtylyov
2016-02-14 19:56 ` [PATCH 1/2] ravb: kill useless *switch* defaults Sergei Shtylyov
2016-02-14 19:56 ` [PATCH 2/2] sh_eth: " Sergei Shtylyov
@ 2016-02-17 20:30 ` David Miller
2016-04-10 20:55 ` [PATCH] ravb: make ravb_ptp_interrupt() *void* Sergei Shtylyov
3 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2016-02-17 20:30 UTC (permalink / raw)
To: sergei.shtylyov; +Cc: netdev, linux-renesas-soc
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Sun, 14 Feb 2016 22:55:05 +0300
> Here's a set of 2 patches against DaveM's 'net-next.git' repo removing
> often used *default* cases doing nothing.
>
> [1/2] ravb: kill useless *switch* defaults
> [2/2] sh_eth: kill useless *switch* defaults
Series applied, thanks Sergei.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ravb: make ravb_ptp_interrupt() *void*
2016-02-14 19:55 [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers Sergei Shtylyov
` (2 preceding siblings ...)
2016-02-17 20:30 ` [PATCH 0/2] Kill useless *switch* defaults in the Renesas Ethernet drivers David Miller
@ 2016-04-10 20:55 ` Sergei Shtylyov
2016-04-14 4:48 ` David Miller
3 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2016-04-10 20:55 UTC (permalink / raw)
To: netdev; +Cc: linux-renesas-soc
When we have the ISS.CGIS bit set, we already know that gPTP interrupt has
happened, so an extra GIS register check at the end of ravb_ptp_interrupt()
seems superfluous. We can model the gPTP interrupt handler like all other
dedicated interrupt handlers in the driver and make it *void*.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
The patch is against the Dave Miller's 'net-next.git' repo.
drivers/net/ethernet/renesas/ravb.h | 2 +-
drivers/net/ethernet/renesas/ravb_main.c | 8 ++++++--
drivers/net/ethernet/renesas/ravb_ptp.c | 9 ++-------
3 files changed, 9 insertions(+), 10 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/ravb.h
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/ravb.h
+++ net-next/drivers/net/ethernet/renesas/ravb.h
@@ -1045,7 +1045,7 @@ void ravb_modify(struct net_device *ndev
u32 set);
int ravb_wait(struct net_device *ndev, enum ravb_reg reg, u32 mask, u32 value);
-irqreturn_t ravb_ptp_interrupt(struct net_device *ndev);
+void ravb_ptp_interrupt(struct net_device *ndev);
void ravb_ptp_init(struct net_device *ndev, struct platform_device *pdev);
void ravb_ptp_stop(struct net_device *ndev);
Index: net-next/drivers/net/ethernet/renesas/ravb_main.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c
+++ net-next/drivers/net/ethernet/renesas/ravb_main.c
@@ -807,8 +807,10 @@ static irqreturn_t ravb_interrupt(int ir
}
/* gPTP interrupt status summary */
- if ((iss & ISS_CGIS) && ravb_ptp_interrupt(ndev) == IRQ_HANDLED)
+ if (iss & ISS_CGIS) {
+ ravb_ptp_interrupt(ndev);
result = IRQ_HANDLED;
+ }
mmiowb();
spin_unlock(&priv->lock);
@@ -838,8 +840,10 @@ static irqreturn_t ravb_multi_interrupt(
}
/* gPTP interrupt status summary */
- if ((iss & ISS_CGIS) && ravb_ptp_interrupt(ndev) == IRQ_HANDLED)
+ if (iss & ISS_CGIS) {
+ ravb_ptp_interrupt(ndev);
result = IRQ_HANDLED;
+ }
mmiowb();
spin_unlock(&priv->lock);
Index: net-next/drivers/net/ethernet/renesas/ravb_ptp.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/ravb_ptp.c
+++ net-next/drivers/net/ethernet/renesas/ravb_ptp.c
@@ -296,7 +296,7 @@ static const struct ptp_clock_info ravb_
};
/* Caller must hold the lock */
-irqreturn_t ravb_ptp_interrupt(struct net_device *ndev)
+void ravb_ptp_interrupt(struct net_device *ndev)
{
struct ravb_private *priv = netdev_priv(ndev);
u32 gis = ravb_read(ndev, GIS);
@@ -319,12 +319,7 @@ irqreturn_t ravb_ptp_interrupt(struct ne
}
}
- if (gis) {
- ravb_write(ndev, ~gis, GIS);
- return IRQ_HANDLED;
- }
-
- return IRQ_NONE;
+ ravb_write(ndev, ~gis, GIS);
}
void ravb_ptp_init(struct net_device *ndev, struct platform_device *pdev)
^ permalink raw reply [flat|nested] 8+ messages in thread