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

Commit 58383c78 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: change member .dev to .parent 



The name .dev in a struct is normally reserved for a struct device
that is let us say a superclass to the thing described by the struct.
struct gpio_chip stands out by confusingly using a struct device *dev
to point to the parent device (such as a platform_device) that
represents the hardware. As we want to give gpio_chip:s real devices,
this is not working. We need to rename this member to parent.

This was done by two coccinelle scripts, I guess it is possible to
combine them into one, but I don't know such stuff. They look like
this:

@@
struct gpio_chip *var;
@@
-var->dev
+var->parent

and:

@@
struct gpio_chip var;
@@
-var.dev
+var.parent

and:

@@
struct bgpio_chip *var;
@@
-var->gc.dev
+var->gc.parent

Plus a few instances of bgpio that I couldn't figure out how
to teach Coccinelle to rewrite.

This patch hits all over the place, but I *strongly* prefer this
solution to any piecemal approaches that just exercise patch
mechanics all over the place. It mainly hits drivers/gpio and
drivers/pinctrl which is my own backyard anyway.

Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Alek Du <alek.du@intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8005c49d

arch/avr32/mach-at32ap/pio.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int __init pio_probe(struct platform_device *pdev) 
	pio->chip.label = pio->name;

	pio->chip.base = pdev->id * 32;

	pio->chip.ngpio = 32;

	pio->chip.dev = &pdev->dev;

	pio->chip.parent = &pdev->dev;

	pio->chip.owner = THIS_MODULE;



	pio->chip.direction_input = direction_input;

drivers/bcma/driver_gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	chip->direction_input	= bcma_gpio_direction_input;

	chip->direction_output	= bcma_gpio_direction_output;

	chip->owner		= THIS_MODULE;

	chip->dev		= bcma_bus_get_host_dev(bus);

	chip->parent		= bcma_bus_get_host_dev(bus);

#if IS_BUILTIN(CONFIG_OF)

	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)

		chip->of_node	= cc->core->dev.of_node;

drivers/gpio/gpio-104-idio-16.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int __init idio_16_probe(struct platform_device *pdev) 
	}



	idio16gpio->chip.label = NAME;

	idio16gpio->chip.dev = dev;

	idio16gpio->chip.parent = dev;

	idio16gpio->chip.owner = THIS_MODULE;

	idio16gpio->chip.base = -1;

	idio16gpio->chip.ngpio = 32;

drivers/gpio/gpio-74x164.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct gen_74x164_chip *gpio_to_74x164_chip(struct gpio_chip *gc) 


static int __gen_74x164_write_config(struct gen_74x164_chip *chip)

{

	struct spi_device *spi = to_spi_device(chip->gpio_chip.dev);

	struct spi_device *spi = to_spi_device(chip->gpio_chip.parent);

	struct spi_message message;

	struct spi_transfer *msg_buf;

	int i, ret = 0;
@@ -143,7 +143,7 @@ static int gen_74x164_probe(struct spi_device *spi) 
		return -ENOMEM;



	chip->gpio_chip.can_sleep = true;

	chip->gpio_chip.dev = &spi->dev;

	chip->gpio_chip.parent = &spi->dev;

	chip->gpio_chip.owner = THIS_MODULE;



	mutex_init(&chip->lock);

drivers/gpio/gpio-adnp.c

+10 −9
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int adnp_read(struct adnp *adnp, unsigned offset, uint8_t *value) 


	err = i2c_smbus_read_byte_data(adnp->client, offset);

	if (err < 0) {

		dev_err(adnp->gpio.dev, "%s failed: %d\n",

		dev_err(adnp->gpio.parent, "%s failed: %d\n",

			"i2c_smbus_read_byte_data()", err);

		return err;

	}
@@ -62,7 +62,7 @@ static int adnp_write(struct adnp *adnp, unsigned offset, uint8_t value) 


	err = i2c_smbus_write_byte_data(adnp->client, offset, value);

	if (err < 0) {

		dev_err(adnp->gpio.dev, "%s failed: %d\n",

		dev_err(adnp->gpio.parent, "%s failed: %d\n",

			"i2c_smbus_write_byte_data()", err);

		return err;

	}
@@ -266,8 +266,8 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios) 
	chip->base = -1;

	chip->ngpio = num_gpios;

	chip->label = adnp->client->name;

	chip->dev = &adnp->client->dev;

	chip->of_node = chip->dev->of_node;

	chip->parent = &adnp->client->dev;

	chip->of_node = chip->parent->of_node;

	chip->owner = THIS_MODULE;



	err = gpiochip_add(chip);
@@ -435,7 +435,8 @@ static int adnp_irq_setup(struct adnp *adnp) 
	 * is chosen to match the register layout of the hardware in that

	 * each segment contains the corresponding bits for all interrupts.

	 */

	adnp->irq_enable = devm_kzalloc(chip->dev, num_regs * 6, GFP_KERNEL);

	adnp->irq_enable = devm_kzalloc(chip->parent, num_regs * 6,

					GFP_KERNEL);

	if (!adnp->irq_enable)

		return -ENOMEM;
@@ -462,12 +463,12 @@ static int adnp_irq_setup(struct adnp *adnp) 
		adnp->irq_enable[i] = 0x00;

	}



	err = devm_request_threaded_irq(chip->dev, adnp->client->irq,

	err = devm_request_threaded_irq(chip->parent, adnp->client->irq,

					NULL, adnp_irq,

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					dev_name(chip->dev), adnp);

					dev_name(chip->parent), adnp);

	if (err != 0) {

		dev_err(chip->dev, "can't request IRQ#%d: %d\n",

		dev_err(chip->parent, "can't request IRQ#%d: %d\n",

			adnp->client->irq, err);

		return err;

	}
@@ -478,7 +479,7 @@ static int adnp_irq_setup(struct adnp *adnp) 
				   handle_simple_irq,

				   IRQ_TYPE_NONE);

	if (err) {

		dev_err(chip->dev,

		dev_err(chip->parent,

			"could not connect irqchip to gpiochip\n");

		return err;

	}