| Message ID | 20230601033002.869-1-jiasheng@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f93b30e50a81a16cefa262b68bde5c4096ea9235 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: systemport: Replace platform_get_irq with platform_get_irq_optional | expand |
On 5/31/23 20:30, Jiasheng Jiang wrote: > Replace platform_get_irq with platform_get_irq_optional because wol_irq > is optional. > > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> I suppose this works as far as communicating the intent and the nature of the interrupt, not that this is a functional change though: Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 1 Jun 2023 11:30:02 +0800 you wrote: > Replace platform_get_irq with platform_get_irq_optional because wol_irq > is optional. > > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- > drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - net: systemport: Replace platform_get_irq with platform_get_irq_optional https://git.kernel.org/netdev/net/c/f93b30e50a81 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 38d0cdaf22a5..bf1611cce974 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -2531,9 +2531,9 @@ static int bcm_sysport_probe(struct platform_device *pdev) priv->irq0 = platform_get_irq(pdev, 0); if (!priv->is_lite) { priv->irq1 = platform_get_irq(pdev, 1); - priv->wol_irq = platform_get_irq(pdev, 2); + priv->wol_irq = platform_get_irq_optional(pdev, 2); } else { - priv->wol_irq = platform_get_irq(pdev, 1); + priv->wol_irq = platform_get_irq_optional(pdev, 1); } if (priv->irq0 <= 0 || (priv->irq1 <= 0 && !priv->is_lite)) { ret = -EINVAL;
Replace platform_get_irq with platform_get_irq_optional because wol_irq is optional. Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)