PMIC: MAX77686: fix invalid bus check
Since p->bus is unsigned checking for negative values is optimized away. Since bus is already used as an argument use tmp. While at it, don't declare variables in the middle of a function. cc: Rajeshwari Shinde <rajeshwari.s@samsung.com> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
parent
0cf7e18904
commit
00d4796c55
|
@ -210,6 +210,10 @@ int pmic_init(unsigned char bus)
|
||||||
{
|
{
|
||||||
static const char name[] = "MAX77686_PMIC";
|
static const char name[] = "MAX77686_PMIC";
|
||||||
struct pmic *p = pmic_alloc();
|
struct pmic *p = pmic_alloc();
|
||||||
|
#ifdef CONFIG_OF_CONTROL
|
||||||
|
const void *blob = gd->fdt_blob;
|
||||||
|
int node, parent, tmp;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!p) {
|
if (!p) {
|
||||||
printf("%s: POWER allocation error!\n", __func__);
|
printf("%s: POWER allocation error!\n", __func__);
|
||||||
|
@ -217,9 +221,6 @@ int pmic_init(unsigned char bus)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_OF_CONTROL
|
#ifdef CONFIG_OF_CONTROL
|
||||||
const void *blob = gd->fdt_blob;
|
|
||||||
int node, parent;
|
|
||||||
|
|
||||||
node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
|
node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
|
||||||
if (node < 0) {
|
if (node < 0) {
|
||||||
debug("PMIC: No node for PMIC Chip in device tree\n");
|
debug("PMIC: No node for PMIC Chip in device tree\n");
|
||||||
|
@ -233,11 +234,13 @@ int pmic_init(unsigned char bus)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
p->bus = i2c_get_bus_num_fdt(parent);
|
/* tmp since p->bus is unsigned */
|
||||||
if (p->bus < 0) {
|
tmp = i2c_get_bus_num_fdt(parent);
|
||||||
|
if (tmp < 0) {
|
||||||
debug("%s: Cannot find I2C bus\n", __func__);
|
debug("%s: Cannot find I2C bus\n", __func__);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
p->bus = tmp;
|
||||||
p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
|
p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
|
||||||
#else
|
#else
|
||||||
p->bus = bus;
|
p->bus = bus;
|
||||||
|
|
Loading…
Reference in New Issue