Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dc6f4aa authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Lee Jones
Browse files

mfd: sec: Use devm_mfd_add_devices and devm_regmap_add_irq_chip 



Use devm_mfd_add_devices() for adding MFD child devices and
devm_regmap_add_irq_chip() for IRQ chip registration.

This reduces the error code path and .remove callback for removing
MFD child devices and deleting IRQ chip data.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Tested-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b36c8272

drivers/mfd/sec-core.c

+3 −17
Original line number Diff line number Diff line
@@ -481,29 +481,16 @@ static int sec_pmic_probe(struct i2c_client *i2c, 
		/* If this happens the probe function is problem */

		BUG();

	}

	ret = mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs, NULL,

			      0, NULL);

	ret = devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs,

				   NULL, 0, NULL);

	if (ret)

		goto err_mfd;

		return ret;



	device_init_wakeup(sec_pmic->dev, sec_pmic->wakeup);

	sec_pmic_configure(sec_pmic);

	sec_pmic_dump_rev(sec_pmic);



	return ret;



err_mfd:

	sec_irq_exit(sec_pmic);

	return ret;

}



static int sec_pmic_remove(struct i2c_client *i2c)

{

	struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c);



	mfd_remove_devices(sec_pmic->dev);

	sec_irq_exit(sec_pmic);

	return 0;

}



static void sec_pmic_shutdown(struct i2c_client *i2c)
@@ -583,7 +570,6 @@ static struct i2c_driver sec_pmic_driver = { 
		   .of_match_table = of_match_ptr(sec_dt_match),

	},

	.probe = sec_pmic_probe,

	.remove = sec_pmic_remove,

	.shutdown = sec_pmic_shutdown,

	.id_table = sec_pmic_id,

};

drivers/mfd/sec-irq.c

+5 −9
Original line number Diff line number Diff line
@@ -483,7 +483,8 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) 
		return -EINVAL;

	}



	ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq,

	ret = devm_regmap_add_irq_chip(sec_pmic->dev, sec_pmic->regmap_pmic,

				       sec_pmic->irq,

				       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				       sec_pmic->irq_base, sec_irq_chip,

				       &sec_pmic->irq_data);
@@ -500,8 +501,3 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) 


	return 0;

}
 


void sec_irq_exit(struct sec_pmic_dev *sec_pmic)

{

	regmap_del_irq_chip(sec_pmic->irq, sec_pmic->irq_data);

}