diff options
| author | Rob Herring <robh@kernel.org> | 2015-10-22 17:22:09 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-10-22 17:22:09 +0300 |
| commit | f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4 (patch) | |
| tree | 8589e85799e0de7b1cdf0b4e8f08397eeeb72a74 /drivers/power/twl4030_charger.c | |
| parent | 307751ee3212df0d047b0e1a93ce21f2e511d1a1 (diff) | |
| parent | eb3fcf007fffe5830d815e713591f3e858f2a365 (diff) | |
| download | linux-f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4.tar.xz | |
Merge branch 'dt-doc-cleanup' into for-next
Diffstat (limited to 'drivers/power/twl4030_charger.c')
| -rw-r--r-- | drivers/power/twl4030_charger.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index f4f2c1f76c32..74f2d3ff1d7c 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -91,7 +91,7 @@ #define TWL4030_MSTATEC_COMPLETE1 0x0b #define TWL4030_MSTATEC_COMPLETE4 0x0e -#if IS_ENABLED(CONFIG_TWL4030_MADC) +#if IS_REACHABLE(CONFIG_TWL4030_MADC) /* * If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11) * then AC is available. @@ -1057,13 +1057,9 @@ static int twl4030_bci_probe(struct platform_device *pdev) phynode = of_find_compatible_node(bci->dev->of_node->parent, NULL, "ti,twl4030-usb"); - if (phynode) { + if (phynode) bci->transceiver = devm_usb_get_phy_by_node( bci->dev, phynode, &bci->usb_nb); - if (IS_ERR(bci->transceiver) && - PTR_ERR(bci->transceiver) == -EPROBE_DEFER) - return -EPROBE_DEFER; - } } /* Enable interrupts now. */ |