[PATCH 1/2] i2c: imx: use devm_request_threaded_irq to simplify code

From: peng . fan
Date: Fri Oct 23 2020 - 04:23:50 EST


From: Peng Fan <peng.fan@xxxxxxx>

Use devm_request_threaded_irq to simplify code

Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
---
drivers/i2c/busses/i2c-imx.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index e6f8d6e45a15..ba9d639223ec 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1216,8 +1216,8 @@ static int i2c_imx_probe(struct platform_device *pdev)
goto rpm_disable;

/* Request IRQ */
- ret = request_threaded_irq(irq, i2c_imx_isr, NULL, IRQF_SHARED,
- pdev->name, i2c_imx);
+ ret = devm_request_threaded_irq(&pdev->dev, irq, i2c_imx_isr, NULL, IRQF_SHARED,
+ pdev->name, i2c_imx);
if (ret) {
dev_err(&pdev->dev, "can't claim irq %d\n", irq);
goto rpm_disable;
@@ -1265,7 +1265,6 @@ static int i2c_imx_probe(struct platform_device *pdev)

clk_notifier_unregister:
clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
- free_irq(irq, i2c_imx);
rpm_disable:
pm_runtime_put_noidle(&pdev->dev);
pm_runtime_disable(&pdev->dev);
@@ -1278,7 +1277,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
static int i2c_imx_remove(struct platform_device *pdev)
{
struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev);
- int irq, ret;
+ int ret;

ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0)
@@ -1298,9 +1297,6 @@ static int i2c_imx_remove(struct platform_device *pdev)
imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR);

clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
- irq = platform_get_irq(pdev, 0);
- if (irq >= 0)
- free_irq(irq, i2c_imx);
clk_disable_unprepare(i2c_imx->clk);

pm_runtime_put_noidle(&pdev->dev);
--
2.28.0