Commit 361856dd authored by Joey Gouly's avatar Joey Gouly Committed by Linus Walleij
Browse files

pinctrl: apple: fix some formatting issues 



Reflow some of the code now that the extra '_gpio' was removed.

Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20211121165642.27883-2-joey.gouly@arm.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2448eab4

drivers/pinctrl/pinctrl-apple-gpio.c

+28 −41
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ static int apple_gpio_dt_node_to_map(struct pinctrl_dev *pctldev, 


	num_pins = ret;



	ret = pinctrl_utils_reserve_map(pctldev, map, &reserved_maps, num_maps,

					num_pins);

	ret = pinctrl_utils_reserve_map(pctldev, map, &reserved_maps, num_maps, num_pins);

	if (ret)

		return ret;
@@ -138,8 +137,7 @@ static int apple_gpio_dt_node_to_map(struct pinctrl_dev *pctldev, 
		}



		group_name = pinctrl_generic_get_group_name(pctldev, pin);

		function_name =

			pinmux_generic_get_function_name(pctl->pctldev, func);

		function_name = pinmux_generic_get_function_name(pctl->pctldev, func);

		ret = pinctrl_utils_add_map_mux(pctl->pctldev, map,

		                                &reserved_maps, num_maps,

		                                group_name, function_name);
@@ -186,8 +184,7 @@ static const struct pinmux_ops apple_gpio_pinmux_ops = { 


/* GPIO chip functions */



static int apple_gpio_get_direction(struct gpio_chip *chip,

					 unsigned int offset)

static int apple_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)

{

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(chip);

	unsigned int reg = apple_gpio_get_reg(pctl, offset);
@@ -211,17 +208,14 @@ static int apple_gpio_get(struct gpio_chip *chip, unsigned offset) 
	return !!(reg & REG_GPIOx_DATA);

}



static void apple_gpio_set(struct gpio_chip *chip, unsigned int offset,

				int value)

static void apple_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)

{

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(chip);



	apple_gpio_set_reg(pctl, offset, REG_GPIOx_DATA,

			   value ? REG_GPIOx_DATA : 0);

	apple_gpio_set_reg(pctl, offset, REG_GPIOx_DATA, value ? REG_GPIOx_DATA : 0);

}



static int apple_gpio_direction_input(struct gpio_chip *chip,

					   unsigned int offset)

static int apple_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)

{

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(chip);
@@ -249,13 +243,10 @@ static int apple_gpio_direction_output(struct gpio_chip *chip, 


static void apple_gpio_irq_ack(struct irq_data *data)

{

	struct apple_gpio_pinctrl *pctl =

		gpiochip_get_data(irq_data_get_irq_chip_data(data));

	unsigned int irqgrp =

		FIELD_GET(REG_GPIOx_GRP, apple_gpio_get_reg(pctl, data->hwirq));

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(irq_data_get_irq_chip_data(data));

	unsigned int irqgrp = FIELD_GET(REG_GPIOx_GRP, apple_gpio_get_reg(pctl, data->hwirq));



	writel(BIT(data->hwirq & 31),

	       pctl->base + REG_IRQ(irqgrp, data->hwirq));

	writel(BIT(data->hwirq & 31), pctl->base + REG_IRQ(irqgrp, data->hwirq));

}



static unsigned int apple_gpio_irq_type(unsigned int type)
@@ -278,16 +269,15 @@ static unsigned int apple_gpio_irq_type(unsigned int type) 


static void apple_gpio_irq_mask(struct irq_data *data)

{

	struct apple_gpio_pinctrl *pctl =

		gpiochip_get_data(irq_data_get_irq_chip_data(data));

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(irq_data_get_irq_chip_data(data));



	apple_gpio_set_reg(pctl, data->hwirq, REG_GPIOx_MODE,

	                   FIELD_PREP(REG_GPIOx_MODE, REG_GPIOx_IN_IRQ_OFF));

}



static void apple_gpio_irq_unmask(struct irq_data *data)

{

	struct apple_gpio_pinctrl *pctl =

		gpiochip_get_data(irq_data_get_irq_chip_data(data));

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(irq_data_get_irq_chip_data(data));

	unsigned int irqtype = apple_gpio_irq_type(irqd_get_trigger_type(data));



	apple_gpio_set_reg(pctl, data->hwirq, REG_GPIOx_MODE,
@@ -308,11 +298,9 @@ static unsigned int apple_gpio_irq_startup(struct irq_data *data) 
	return 0;

}



static int apple_gpio_irq_set_type(struct irq_data *data,

					unsigned int type)

static int apple_gpio_irq_set_type(struct irq_data *data, unsigned int type)

{

	struct apple_gpio_pinctrl *pctl =

		gpiochip_get_data(irq_data_get_irq_chip_data(data));

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(irq_data_get_irq_chip_data(data));

	unsigned int irqtype = apple_gpio_irq_type(type);



	if (irqtype == REG_GPIOx_IN_IRQ_OFF)
@@ -402,8 +390,7 @@ static int apple_gpio_register(struct apple_gpio_pinctrl *pctl) 
		}



		for (i = 0; i < girq->num_parents; i++) {

			ret = platform_get_irq(to_platform_device(pctl->dev),

					       i);

			ret = platform_get_irq(to_platform_device(pctl->dev), i);

			if (ret < 0)

				goto out;