]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
extcon: sm5502: Use devm_regmap_add_irq_chip()
authorStephan Gerhold <stephan@gerhold.net>
Mon, 31 May 2021 13:34:33 +0000 (15:34 +0200)
committerChanwoo Choi <cw00.choi@samsung.com>
Mon, 21 Jun 2021 09:28:00 +0000 (18:28 +0900)
Use devm_regmap_add_irq_chip() to avoid having to remove the
irqchip explicitly in sm5502_muic_i2c_remove().

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-sm5502.c

index c3e4b220e66fafa27b34903b6bd2a2e601ff43fb..a1040c929237a1e18839f676f350e42ad85bba32 100644 (file)
@@ -599,8 +599,8 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c,
 
        /* Support irq domain for SM5502 MUIC device */
        irq_flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_SHARED;
-       ret = regmap_add_irq_chip(info->regmap, info->irq, irq_flags, 0,
-                                 &sm5502_muic_irq_chip, &info->irq_data);
+       ret = devm_regmap_add_irq_chip(info->dev, info->regmap, info->irq, irq_flags,
+                                      0, &sm5502_muic_irq_chip, &info->irq_data);
        if (ret != 0) {
                dev_err(info->dev, "failed to request IRQ %d: %d\n",
                                    info->irq, ret);
@@ -660,15 +660,6 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c,
        return 0;
 }
 
-static int sm5502_muic_i2c_remove(struct i2c_client *i2c)
-{
-       struct sm5502_muic_info *info = i2c_get_clientdata(i2c);
-
-       regmap_del_irq_chip(info->irq, info->irq_data);
-
-       return 0;
-}
-
 static const struct of_device_id sm5502_dt_match[] = {
        { .compatible = "siliconmitus,sm5502-muic" },
        { },
@@ -713,7 +704,6 @@ static struct i2c_driver sm5502_muic_i2c_driver = {
                .of_match_table = sm5502_dt_match,
        },
        .probe  = sm5022_muic_i2c_probe,
-       .remove = sm5502_muic_i2c_remove,
        .id_table = sm5502_i2c_id,
 };