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

Commit 003db34e authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones
Browse files

mfd: arizona: Use arizona_map_irq instead of hard coding it 



We have arizona_map_irq we might as well use it rather than hard coding
it in several places.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 128818f1

drivers/mfd/arizona-irq.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -204,7 +204,7 @@ static const struct irq_domain_ops arizona_domain_ops = { 
int arizona_irq_init(struct arizona *arizona)

int arizona_irq_init(struct arizona *arizona)

{

{

	int flags = IRQF_ONESHOT;

	int flags = IRQF_ONESHOT;

	int ret, i;

	int ret;

	const struct regmap_irq_chip *aod, *irq;

	const struct regmap_irq_chip *aod, *irq;

	struct irq_data *irq_data;

	struct irq_data *irq_data;
@@ -368,9 +368,8 @@ int arizona_irq_init(struct arizona *arizona) 
	}

	}





	/* Make sure the boot done IRQ is unmasked for resumes */

	/* Make sure the boot done IRQ is unmasked for resumes */

	i = arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE);

	ret = arizona_request_irq(arizona, ARIZONA_IRQ_BOOT_DONE, "Boot done",

	ret = request_threaded_irq(i, NULL, arizona_boot_done, IRQF_ONESHOT,

				  arizona_boot_done, arizona);

				   "Boot done", arizona);

	if (ret != 0) {

	if (ret != 0) {

		dev_err(arizona->dev, "Failed to request boot done %d: %d\n",

		dev_err(arizona->dev, "Failed to request boot done %d: %d\n",

			arizona->irq, ret);

			arizona->irq, ret);
@@ -379,10 +378,9 @@ int arizona_irq_init(struct arizona *arizona) 




	/* Handle control interface errors in the core */

	/* Handle control interface errors in the core */

	if (arizona->ctrlif_error) {

	if (arizona->ctrlif_error) {

		i = arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR);

		ret = arizona_request_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR,

		ret = request_threaded_irq(i, NULL, arizona_ctrlif_err,

					  "Control interface error",

					   IRQF_ONESHOT,

					  arizona_ctrlif_err, arizona);

					   "Control interface error", arizona);

		if (ret != 0) {

		if (ret != 0) {

			dev_err(arizona->dev,

			dev_err(arizona->dev,

				"Failed to request CTRLIF_ERR %d: %d\n",

				"Failed to request CTRLIF_ERR %d: %d\n",
@@ -394,7 +392,7 @@ int arizona_irq_init(struct arizona *arizona) 
	return 0;

	return 0;





err_ctrlif:

err_ctrlif:

	free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);

	arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);

err_boot_done:

err_boot_done:

	free_irq(arizona->irq, arizona);

	free_irq(arizona->irq, arizona);

err_main_irq:

err_main_irq:
@@ -410,9 +408,9 @@ int arizona_irq_init(struct arizona *arizona) 
int arizona_irq_exit(struct arizona *arizona)

int arizona_irq_exit(struct arizona *arizona)

{

{

	if (arizona->ctrlif_error)

	if (arizona->ctrlif_error)

		free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR),

		arizona_free_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, arizona);

			 arizona);

	arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);

	free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);



	regmap_del_irq_chip(irq_find_mapping(arizona->virq, 1),

	regmap_del_irq_chip(irq_find_mapping(arizona->virq, 1),

			    arizona->irq_chip);

			    arizona->irq_chip);

	regmap_del_irq_chip(irq_find_mapping(arizona->virq, 0),

	regmap_del_irq_chip(irq_find_mapping(arizona->virq, 0),