Commit 7341fa7a authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Linus Walleij
Browse files

gpio: pca953x: reduce indentation level in pca953x_irq_setup() 



The current design of pca953x_irq_setup() is:

 if (all conditions to support IRQ are met) {
   lots of code to support IRQs, which goes to a serious indentation
   level.
 }

 return 0;

It makes more sense to handle this like this:

 if (!all conditions to support IRQ are met)
   return 0;

 handle IRQ support

This commit does just this change, reducing by one tab the indentation
level of the IRQ setup code. Thanks to this reduced indentation level,
we are less restricted by the 80-column limit, and we can have more
function arguments on the same line.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a3f1caee

drivers/gpio/gpio-pca953x.c

+42 −42
Original line number Diff line number Diff line
@@ -702,10 +702,16 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
	int reg_direction[MAX_BANK];

	int ret, i;



	if (client->irq && irq_base != -1

			&& (chip->driver_data & PCA_INT)) {

		ret = pca953x_read_regs(chip,

					chip->regs->input, chip->irq_stat);

	if (!client->irq)

		return 0;



	if (irq_base == -1)

		return 0;



	if (!(chip->driver_data & PCA_INT))

		return 0;



	ret = pca953x_read_regs(chip, chip->regs->input, chip->irq_stat);

	if (ret)

		return ret;
@@ -714,16 +720,14 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
	 * interrupt.  We have to rely on the previous read for

	 * this purpose.

	 */

		regmap_bulk_read(chip->regmap, chip->regs->direction,

				 reg_direction, NBANK(chip));

	regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,

			 NBANK(chip));

	for (i = 0; i < NBANK(chip); i++)

		chip->irq_stat[i] &= reg_direction[i];

	mutex_init(&chip->irq_lock);



		ret = devm_request_threaded_irq(&client->dev,

					client->irq,

					   NULL,

					   pca953x_irq_handler,

	ret = devm_request_threaded_irq(&client->dev, client->irq,

					NULL, pca953x_irq_handler,

					IRQF_TRIGGER_LOW | IRQF_ONESHOT |

					IRQF_SHARED,

					dev_name(&client->dev), chip);
@@ -733,10 +737,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
		return ret;

	}



		ret =  gpiochip_irqchip_add_nested(&chip->gpio_chip,

						   &pca953x_irq_chip,

						   irq_base,

						   handle_simple_irq,

	ret =  gpiochip_irqchip_add_nested(&chip->gpio_chip, &pca953x_irq_chip,

					   irq_base, handle_simple_irq,

					   IRQ_TYPE_NONE);

	if (ret) {

		dev_err(&client->dev,
@@ -744,10 +746,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
		return ret;

	}



		gpiochip_set_nested_irqchip(&chip->gpio_chip,

					    &pca953x_irq_chip,

	gpiochip_set_nested_irqchip(&chip->gpio_chip, &pca953x_irq_chip,

				    client->irq);

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE