Re: [PATCH] gpio: change member .dev to .parent

[Lee Jones <lee.jones@linaro.org>]

On Wed, 04 Nov 2015, Linus Walleij wrote:

> 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
> 
> 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: Hans-Christian Egtvedt <egtvedt@samfundet.no>
> Cc: Rafał Miłecki <zajec5@gmail.com>
> Cc: Jiri Kosina <jikos@kernel.org>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Alek Du <alek.du@intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Other subsystem maintainers: please ACK this. I want to merge this
> big patch in the beginning of -rc1. I can create an immutable branch
> or tag if you think it will cause you problems, so you can pull it
> in.
> ---

[...]

>  drivers/mfd/dm355evm_msp.c                    |  2 +-
>  drivers/mfd/htc-egpio.c                       |  2 +-
>  drivers/mfd/htc-i2cpld.c                      |  4 +--
>  drivers/mfd/tps65010.c                        |  2 +-

[...]

>  120 files changed, 265 insertions(+), 252 deletions(-)

[...]

> diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
> index 4c826f78acd0..bc90efe01b59 100644
> --- a/drivers/mfd/dm355evm_msp.c
> +++ b/drivers/mfd/dm355evm_msp.c
> @@ -259,7 +259,7 @@ static int add_children(struct i2c_client *client)
>  	int		i;
>  
>  	/* GPIO-ish stuff */
> -	dm355evm_msp_gpio.dev = &client->dev;
> +	dm355evm_msp_gpio.parent = &client->dev;
>  	status = gpiochip_add(&dm355evm_msp_gpio);
>  	if (status < 0)
>  		return status;
> diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
> index 6ccaf90d98fd..eca19d637785 100644
> --- a/drivers/mfd/htc-egpio.c
> +++ b/drivers/mfd/htc-egpio.c
> @@ -321,7 +321,7 @@ static int __init egpio_probe(struct platform_device *pdev)
>  		ei->chip[i].dev = &(pdev->dev);
>  		chip = &(ei->chip[i].chip);
>  		chip->label           = "htc-egpio";
> -		chip->dev             = &pdev->dev;
> +		chip->parent             = &pdev->dev;

Are you buggering up my tabbing, or is this a Gitisum?

I'm sure it is.  Anyway:

  Acked-by: Lee Jones <lee.jones@linaro.org>

.. use it wisely. ;)

>  		chip->owner           = THIS_MODULE;
>  		chip->get             = egpio_get;
>  		chip->set             = egpio_set;
> diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
> index 1bd5b042c8b3..a36f6a5a308b 100644
> --- a/drivers/mfd/htc-i2cpld.c
> +++ b/drivers/mfd/htc-i2cpld.c
> @@ -430,7 +430,7 @@ static int htcpld_register_chip_gpio(
>  	/* Setup the GPIO chips */
>  	gpio_chip = &(chip->chip_out);
>  	gpio_chip->label           = "htcpld-out";
> -	gpio_chip->dev             = dev;
> +	gpio_chip->parent             = dev;
>  	gpio_chip->owner           = THIS_MODULE;
>  	gpio_chip->get             = htcpld_chip_get;
>  	gpio_chip->set             = htcpld_chip_set;
> @@ -441,7 +441,7 @@ static int htcpld_register_chip_gpio(
>  
>  	gpio_chip = &(chip->chip_in);
>  	gpio_chip->label           = "htcpld-in";
> -	gpio_chip->dev             = dev;
> +	gpio_chip->parent             = dev;
>  	gpio_chip->owner           = THIS_MODULE;
>  	gpio_chip->get             = htcpld_chip_get;
>  	gpio_chip->set             = NULL;
> diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
> index 448f0a182dc4..b96847491277 100644
> --- a/drivers/mfd/tps65010.c
> +++ b/drivers/mfd/tps65010.c
> @@ -638,7 +638,7 @@ static int tps65010_probe(struct i2c_client *client,
>  		tps->outmask = board->outmask;
>  
>  		tps->chip.label = client->name;
> -		tps->chip.dev = &client->dev;
> +		tps->chip.parent = &client->dev;
>  		tps->chip.owner = THIS_MODULE;
>  
>  		tps->chip.set = tps65010_gpio_set;

[...]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html