Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fixes from Sebastian Reichel:
"twl4030-charger fixes"
* tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
twl4030_charger: fix another compile error
Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
+2
-6
+2
-6
drivers/power/twl4030_charger.c
+2
-6
drivers/power/twl4030_charger.c
···
91
91
#define TWL4030_MSTATEC_COMPLETE1 0x0b
92
92
#define TWL4030_MSTATEC_COMPLETE4 0x0e
93
93
94
-
#if IS_ENABLED(CONFIG_TWL4030_MADC)
94
+
#if IS_REACHABLE(CONFIG_TWL4030_MADC)
95
95
/*
96
96
* If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
97
97
* then AC is available.
···
1057
1057
1058
1058
phynode = of_find_compatible_node(bci->dev->of_node->parent,
1059
1059
NULL, "ti,twl4030-usb");
1060
-
if (phynode) {
1060
+
if (phynode)
1061
1061
bci->transceiver = devm_usb_get_phy_by_node(
1062
1062
bci->dev, phynode, &bci->usb_nb);
1063
-
if (IS_ERR(bci->transceiver) &&
1064
-
PTR_ERR(bci->transceiver) == -EPROBE_DEFER)
1065
-
return -EPROBE_DEFER;
1066
-
}
1067
1063
}
1068
1064
1069
1065
/* Enable interrupts now. */