From 3f182f4ce932723e04837e14aebfbdc7ce3add74 Mon Sep 17 00:00:00 2001
From: Chandrabhanu Mahapatra <cmahapatra@ti.com>
Date: Tue, 10 Jul 2012 19:05:37 +0530
Subject: [PATCH] --- yaml --- r: 318455 b: refs/heads/master c:
 6a7b36aa4b0afbe7a9798feac16de47ad856f358 h: refs/heads/master i:   318453:
 7e195274c49fa640cfb02480b90c84f2022e791e   318451:
 28a010eba23edefccaa1ed2b0346edab4a5c129d   318447:
 b405c21c22b7c13a64f66ca0446456be8ef3a00e v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/gpio/gpio-pca953x.c | 11 ++++++-----
 trunk/include/linux/i2c/pca953x.h |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2dff898eb62b..327411466d7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 346720130aa49e1b711c0900e98fd12f4de972b0
+refs/heads/master: 6a7b36aa4b0afbe7a9798feac16de47ad856f358
diff --git a/trunk/drivers/gpio/gpio-pca953x.c b/trunk/drivers/gpio/gpio-pca953x.c
index de24af202447..266b910de43b 100644
--- a/trunk/drivers/gpio/gpio-pca953x.c
+++ b/trunk/drivers/gpio/gpio-pca953x.c
@@ -568,7 +568,7 @@ static void pca953x_irq_teardown(struct pca953x_chip *chip)
  * WARNING: This is DEPRECATED and will be removed eventually!
  */
 static void
-pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
+pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert)
 {
 	struct device_node *node;
 	const __be32 *val;
@@ -596,13 +596,13 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
 }
 #else
 static void
-pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
+pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert)
 {
 	*gpio_base = -1;
 }
 #endif
 
-static int __devinit device_pca953x_init(struct pca953x_chip *chip, int invert)
+static int __devinit device_pca953x_init(struct pca953x_chip *chip, u32 invert)
 {
 	int ret;
 
@@ -621,7 +621,7 @@ static int __devinit device_pca953x_init(struct pca953x_chip *chip, int invert)
 	return ret;
 }
 
-static int __devinit device_pca957x_init(struct pca953x_chip *chip, int invert)
+static int __devinit device_pca957x_init(struct pca953x_chip *chip, u32 invert)
 {
 	int ret;
 	u32 val = 0;
@@ -657,8 +657,9 @@ static int __devinit pca953x_probe(struct i2c_client *client,
 {
 	struct pca953x_platform_data *pdata;
 	struct pca953x_chip *chip;
-	int irq_base=0, invert=0;
+	int irq_base = 0;
 	int ret;
+	u32 invert = 0;
 
 	chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL);
 	if (chip == NULL)
diff --git a/trunk/include/linux/i2c/pca953x.h b/trunk/include/linux/i2c/pca953x.h
index 139ba52667c8..3c98dd4f901f 100644
--- a/trunk/include/linux/i2c/pca953x.h
+++ b/trunk/include/linux/i2c/pca953x.h
@@ -11,7 +11,7 @@ struct pca953x_platform_data {
 	unsigned	gpio_base;
 
 	/* initial polarity inversion setting */
-	uint16_t	invert;
+	u32		invert;
 
 	/* interrupt base */
 	int		irq_base;