Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 050cde1363a3fc59f2a2f1cac6ef050393a00c99

Authored by Peter Ujfalusi
Committed by Samuel Ortiz
1 parent 5d4e9bd79a

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>

Showing 1 changed file with 2 additions and 11 deletions Side-by-side Diff

drivers/mfd/twl-core.c
Diff comments   View file @ 050cde1
... ... @@ -72,7 +72,6 @@
72 72 #define SUB_CHIP_ID1 1
73 73 #define SUB_CHIP_ID2 2
74 74 #define SUB_CHIP_ID3 3
75   -#define SUB_CHIP_ID_INVAL 0xff
76 75  
77 76 /* Base Address defns for twl4030_map[] */
78 77  
79 78  
... ... @@ -326,12 +325,8 @@
326 325 pr_err("%s: not initialized\n", DRIVER_NAME);
327 326 return -EPERM;
328 327 }
  328 +
329 329 sid = twl_map[mod_no].sid;
330   - if (unlikely(sid == SUB_CHIP_ID_INVAL)) {
331   - pr_err("%s: module %d is not part of the pmic\n",
332   - DRIVER_NAME, mod_no);
333   - return -EINVAL;
334   - }
335 330 twl = &twl_modules[sid];
336 331  
337 332 ret = regmap_bulk_write(twl->regmap, twl_map[mod_no].base + reg,
338 333  
... ... @@ -368,12 +363,8 @@
368 363 pr_err("%s: not initialized\n", DRIVER_NAME);
369 364 return -EPERM;
370 365 }
  366 +
371 367 sid = twl_map[mod_no].sid;
372   - if (unlikely(sid == SUB_CHIP_ID_INVAL)) {
373   - pr_err("%s: module %d is not part of the pmic\n",
374   - DRIVER_NAME, mod_no);
375   - return -EINVAL;
376   - }
377 368 twl = &twl_modules[sid];
378 369  
379 370 ret = regmap_bulk_read(twl->regmap, twl_map[mod_no].base + reg,