diff mbox series

power: supply: cpcap: Drop non-DT driver matching

Message ID 20231009172923.2457844-20-robh@kernel.org
State Accepted
Commit b3c3a197baf23ca445ba74e3c7c40cfacfedd9fb
Headers show
Series power: supply: cpcap: Drop non-DT driver matching | expand

Commit Message

Rob Herring (Arm) Oct. 9, 2023, 5:29 p.m. UTC 
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 <robh@kernel.org>
---
 drivers/power/supply/cpcap-charger.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Comments

Sebastian Reichel Oct. 13, 2023, 2:03 a.m. UTC | #1 
On Mon, 09 Oct 2023 12:29:15 -0500, Rob Herring wrote:
> 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,
diff mbox series

Patch

diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 431e951cccf0..cebca34ff872 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -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_OF
 static 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,