From 40452223d6a8c184db9836cea9f32e7f7f24ebe9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 29 Jul 2024 18:31:53 -0700 Subject: [PATCH] ramips: ethernet: use devm for request_irq Allows removing free_irq. Simpler. Oddly enough the other switch code already does this. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16050 Signed-off-by: Robert Marko --- .../linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c | 2 +- .../ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c index dcaff04db1..5853df70c5 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c @@ -245,7 +245,7 @@ int mtk_gsw_init(struct fe_priv *priv) mt7620_ephy_init(gsw); if (gsw->irq) { - ret = request_irq(gsw->irq, gsw_interrupt_mt7620, 0, + ret = devm_request_irq(&pdev->dev, gsw->irq, gsw_interrupt_mt7620, 0, "gsw", priv); if (ret) { dev_err(&pdev->dev, "Failed to request irq"); diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c index e794f8d5cb..e261d90924 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c @@ -1414,7 +1414,6 @@ static void fe_uninit(struct net_device *dev) fe_mdio_cleanup(priv); fe_reg_w32(0, FE_REG_FE_INT_ENABLE); - free_irq(dev->irq, dev); } static int fe_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -- 2.30.2