diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-01-16 14:53:51 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-14 00:22:49 +0100 |
| commit | 050cde1363a3fc59f2a2f1cac6ef050393a00c99 (patch) | |
| tree | deffc2b4e2a057f3cd25135f4dfe724e8fb467f1 /drivers/mfd/twl-core.c | |
| parent | 5d4e9bd79a5ab5bd4695d3becaa71da447a76a94 (diff) | |
| download | lwn-050cde1363a3fc59f2a2f1cac6ef050393a00c99.tar.gz lwn-050cde1363a3fc59f2a2f1cac6ef050393a00c99.zip | |
mfd: twl-core: No need to check for invalid subchip ID
The module id table no longer can have invalid/unused entries.
No need for checking the ID for validity.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl-core.c')
| -rw-r--r-- | drivers/mfd/twl-core.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index b781cdd0629d..fa1a5a0fa759 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -72,7 +72,6 @@ #define SUB_CHIP_ID1 1 #define SUB_CHIP_ID2 2 #define SUB_CHIP_ID3 3 -#define SUB_CHIP_ID_INVAL 0xff /* Base Address defns for twl4030_map[] */ @@ -326,12 +325,8 @@ int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes) pr_err("%s: not initialized\n", DRIVER_NAME); return -EPERM; } + sid = twl_map[mod_no].sid; - if (unlikely(sid == SUB_CHIP_ID_INVAL)) { - pr_err("%s: module %d is not part of the pmic\n", - DRIVER_NAME, mod_no); - return -EINVAL; - } twl = &twl_modules[sid]; ret = regmap_bulk_write(twl->regmap, twl_map[mod_no].base + reg, @@ -368,12 +363,8 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes) pr_err("%s: not initialized\n", DRIVER_NAME); return -EPERM; } + sid = twl_map[mod_no].sid; - if (unlikely(sid == SUB_CHIP_ID_INVAL)) { - pr_err("%s: module %d is not part of the pmic\n", - DRIVER_NAME, mod_no); - return -EINVAL; - } twl = &twl_modules[sid]; ret = regmap_bulk_read(twl->regmap, twl_map[mod_no].base + reg, |