power: supply: cpcap: Drop non-DT driver matching
PATCH 1/1 power: supply: cpcap: Drop non-DT driver matching
Only DT based probing is used for the Motorola CPCAP charger driver, so drop the !CONFIG_OF parts and redundant of_match_device() call.
Signed-off-by Rob Herring <[email protected]>
--- drivers/power/supply/cpcap-charger.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/power/supply/cpcap-charger.c +2 -11
@@ -17,8 +17,7 @@#include <linux/err.h> #include <linux/interrupt.h> #include <linux/notifier.h> -#include <linux/of.h> -#include <linux/of_platform.h> +#include <linux/mod_devicetable.h> #include <linux/platform_device.h> #include <linux/power_supply.h> #include <linux/regmap.h>
@@ -865,7 +864,6 @@ static const struct power_supply_desc cpcap_charger_usb_desc = { .property_is_writeable = cpcap_charger_property_is_writeable, }; -#ifdef CONFIG_OFstatic const struct of_device_id cpcap_charger_id_table[] = { { .compatible ="motorola,mapphone-cpcap-charger" ,
@@ -873,20 +871,13 @@ static const struct of_device_id cpcap_charger_id_table[] = { {}, };MODULE_DEVICE_TABLE (of, cpcap_charger_id_table); -#endif static int cpcap_charger_probe (struct platform_device *pdev) {struct cpcap_charger_ddata *ddata; -const struct of_device_id *of_id;struct power_supply_config psy_cfg = {};int error; - of_id =of_match_device (of_match_ptr (cpcap_charger_id_table), - &pdev->dev); -if (!of_id) -return -EINVAL ; - ddata =devm_kzalloc (&pdev->dev,sizeof (*ddata),GFP_KERNEL );if (!ddata)return -ENOMEM ;
@@ -975,7 +966,7 @@ static struct platform_driver cpcap_charger_driver = { .probe = cpcap_charger_probe, .driver = { .name = "cpcap-charger", - .of_match_table = of_match_ptr(cpcap_charger_id_table), + .of_match_table = cpcap_charger_id_table, }, .shutdown = cpcap_charger_shutdown, .remove_new = cpcap_charger_remove,
Signature · 1 line
2.42.0
Sebastian Reichel
AppliedQuoted 4 lines · Rob Herring
Only DT based probing is used for the Motorola CPCAP charger driver, so drop the !CONFIG_OF parts and redundant
of_match_device()call.
Applied, thanks!
[1/1] power: supply: cpcap: Drop non-DT driver matching
commit: b3c3a197baf23ca445ba74e3c7c40cfacfedd9fb
Best regards,
Signature · 1 line
Sebastian Reichel <[email protected]>