diff mbox

[v2,4/5] gpio: pca953x: remove an unused variable

Message ID 1473240297-19881-5-git-send-email-bgolaszewski@baylibre.com
State New
Headers show

Commit Message

Bartosz Golaszewski Sept. 7, 2016, 9:24 a.m. UTC
The chip_type variable in struct pca953x_chip is no longer required.

Remove it.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 drivers/gpio/gpio-pca953x.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Andy Shevchenko Sept. 7, 2016, 11:36 a.m. UTC | #1
On Wed, 2016-09-07 at 11:24 +0200, Bartosz Golaszewski wrote:
> The chip_type variable in struct pca953x_chip is no longer required.
> 
> Remove it.

Would it be patch 4 in the series?

> 
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>  drivers/gpio/gpio-pca953x.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
> index 6b62898..00bb2ea 100644
> --- a/drivers/gpio/gpio-pca953x.c
> +++ b/drivers/gpio/gpio-pca953x.c
> @@ -129,7 +129,6 @@ struct pca953x_chip {
>  	struct i2c_client *client;
>  	struct gpio_chip gpio_chip;
>  	const char *const *names;
> -	int	chip_type;
>  	unsigned long driver_data;
>  
>  	const struct pca953x_offset *offset;
> @@ -760,8 +759,6 @@ static int pca953x_probe(struct i2c_client
> *client,
>  		}
>  	}
>  
> -	chip->chip_type = PCA_CHIP_TYPE(chip->driver_data);
> -
>  	mutex_init(&chip->i2c_lock);
>  
>  	/* initialize cached registers from their original values.
> @@ -774,7 +771,7 @@ static int pca953x_probe(struct i2c_client
> *client,
>  	else if (chip->gpio_chip.ngpio >= 24)
>  		chip->write_regs = pca953x_write_regs_24;
>  
> -	if (chip->chip_type == PCA953X_TYPE)
> +	if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE)
>  		ret = device_pca953x_init(chip, invert);
>  	else
>  		ret = device_pca957x_init(chip, invert);
Bartosz Golaszewski Sept. 7, 2016, 11:40 a.m. UTC | #2
2016-09-07 13:36 GMT+02:00 Andy Shevchenko <andriy.shevchenko@linux.intel.com>:
> On Wed, 2016-09-07 at 11:24 +0200, Bartosz Golaszewski wrote:
>> The chip_type variable in struct pca953x_chip is no longer required.
>>
>> Remove it.
>
> Would it be patch 4 in the series?

Hi Andy,

I'm afraid I don't understand the question. Could you elaborate?

Thanks,
Bartosz
--
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
Andy Shevchenko Sept. 7, 2016, 12:17 p.m. UTC | #3
On Wed, 2016-09-07 at 13:40 +0200, Bartosz Golaszewski wrote:
> 2016-09-07 13:36 GMT+02:00 Andy Shevchenko <andriy.shevchenko@linux.in
> tel.com>:
> > 
> > On Wed, 2016-09-07 at 11:24 +0200, Bartosz Golaszewski wrote:
> > > 
> > > The chip_type variable in struct pca953x_chip is no longer
> > > required.
> > > 
> > > Remove it.
> > 
> > Would it be patch 4 in the series?
> 
> Hi Andy,
> 
> I'm afraid I don't understand the question. Could you elaborate?

Same as for patch 1. This is not critical to have it before 5.
So, after rearrangement it would be 4th followed by 5th (aka patch 1 in
current series).
diff mbox

Patch

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 6b62898..00bb2ea 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -129,7 +129,6 @@  struct pca953x_chip {
 	struct i2c_client *client;
 	struct gpio_chip gpio_chip;
 	const char *const *names;
-	int	chip_type;
 	unsigned long driver_data;
 
 	const struct pca953x_offset *offset;
@@ -760,8 +759,6 @@  static int pca953x_probe(struct i2c_client *client,
 		}
 	}
 
-	chip->chip_type = PCA_CHIP_TYPE(chip->driver_data);
-
 	mutex_init(&chip->i2c_lock);
 
 	/* initialize cached registers from their original values.
@@ -774,7 +771,7 @@  static int pca953x_probe(struct i2c_client *client,
 	else if (chip->gpio_chip.ngpio >= 24)
 		chip->write_regs = pca953x_write_regs_24;
 
-	if (chip->chip_type == PCA953X_TYPE)
+	if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE)
 		ret = device_pca953x_init(chip, invert);
 	else
 		ret = device_pca957x_init(chip, invert);