summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-10-14 15:31:59 +0200
committerGrant Likely <grant.likely@secretlab.ca>2011-10-29 12:26:29 +0200
commitf0eb824beee3f596b9799e667a6fdac3116e9f7d (patch)
tree06d1247aad91c4b883a3e760881917485188ae1a
parentd92ef29a6fa971d9e314e412cd9c09757906411a (diff)
downloadkernel-uprobes-f0eb824beee3f596b9799e667a6fdac3116e9f7d.tar.gz
kernel-uprobes-f0eb824beee3f596b9799e667a6fdac3116e9f7d.tar.xz
kernel-uprobes-f0eb824beee3f596b9799e667a6fdac3116e9f7d.zip
gpio: pca953x: remove unneeded check for chip type
We can assume our own device_id table is correct, so remove checking if the chip type is valid. (The check was bogus anyway: If it found an invalid entry, it returned with 0!) This is in preparation for further cleanups. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--drivers/gpio/gpio-pca953x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index c43b8ff626a..45de6a4ac63 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -673,10 +673,8 @@ static int __devinit pca953x_probe(struct i2c_client *client,
if (chip->chip_type == PCA953X_TYPE)
device_pca953x_init(chip, invert);
- else if (chip->chip_type == PCA957X_TYPE)
- device_pca957x_init(chip, invert);
else
- goto out_failed;
+ device_pca957x_init(chip, invert);
ret = pca953x_irq_setup(chip, id, irq_base);
if (ret)