Commit b3c3a197 authored by Rob Herring's avatar Rob Herring Committed by Sebastian Reichel
Browse files

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: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231009172923.2457844-20-robh@kernel.org


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 3c693ac2

drivers/power/supply/cpcap-charger.c

+2 −11
Original line number Diff line number Diff line
@@ -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,