diff options
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 11 | ||||
| -rw-r--r-- | include/linux/i2c/pca953x.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index de24af202447..266b910de43b 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c | |||
| @@ -568,7 +568,7 @@ static void pca953x_irq_teardown(struct pca953x_chip *chip) | |||
| 568 | * WARNING: This is DEPRECATED and will be removed eventually! | 568 | * WARNING: This is DEPRECATED and will be removed eventually! |
| 569 | */ | 569 | */ |
| 570 | static void | 570 | static void |
| 571 | pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) | 571 | pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert) |
| 572 | { | 572 | { |
| 573 | struct device_node *node; | 573 | struct device_node *node; |
| 574 | const __be32 *val; | 574 | const __be32 *val; |
| @@ -596,13 +596,13 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) | |||
| 596 | } | 596 | } |
| 597 | #else | 597 | #else |
| 598 | static void | 598 | static void |
| 599 | pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) | 599 | pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert) |
| 600 | { | 600 | { |
| 601 | *gpio_base = -1; | 601 | *gpio_base = -1; |
| 602 | } | 602 | } |
| 603 | #endif | 603 | #endif |
| 604 | 604 | ||
| 605 | static int __devinit device_pca953x_init(struct pca953x_chip *chip, int invert) | 605 | static int __devinit device_pca953x_init(struct pca953x_chip *chip, u32 invert) |
| 606 | { | 606 | { |
| 607 | int ret; | 607 | int ret; |
| 608 | 608 | ||
| @@ -621,7 +621,7 @@ out: | |||
| 621 | return ret; | 621 | return ret; |
| 622 | } | 622 | } |
| 623 | 623 | ||
| 624 | static int __devinit device_pca957x_init(struct pca953x_chip *chip, int invert) | 624 | static int __devinit device_pca957x_init(struct pca953x_chip *chip, u32 invert) |
| 625 | { | 625 | { |
| 626 | int ret; | 626 | int ret; |
| 627 | u32 val = 0; | 627 | u32 val = 0; |
| @@ -657,8 +657,9 @@ static int __devinit pca953x_probe(struct i2c_client *client, | |||
| 657 | { | 657 | { |
| 658 | struct pca953x_platform_data *pdata; | 658 | struct pca953x_platform_data *pdata; |
| 659 | struct pca953x_chip *chip; | 659 | struct pca953x_chip *chip; |
| 660 | int irq_base=0, invert=0; | 660 | int irq_base = 0; |
| 661 | int ret; | 661 | int ret; |
| 662 | u32 invert = 0; | ||
| 662 | 663 | ||
| 663 | chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL); | 664 | chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL); |
| 664 | if (chip == NULL) | 665 | if (chip == NULL) |
diff --git a/include/linux/i2c/pca953x.h b/include/linux/i2c/pca953x.h index 139ba52667c8..3c98dd4f901f 100644 --- a/include/linux/i2c/pca953x.h +++ b/include/linux/i2c/pca953x.h | |||
| @@ -11,7 +11,7 @@ struct pca953x_platform_data { | |||
| 11 | unsigned gpio_base; | 11 | unsigned gpio_base; |
| 12 | 12 | ||
| 13 | /* initial polarity inversion setting */ | 13 | /* initial polarity inversion setting */ |
| 14 | uint16_t invert; | 14 | u32 invert; |
| 15 | 15 | ||
| 16 | /* interrupt base */ | 16 | /* interrupt base */ |
| 17 | int irq_base; | 17 | int irq_base; |
