Commit 0668281d authored by Tang Bin's avatar Tang Bin Committed by Sebastian Reichel
Browse files

power: supply: cpcap-battery: use device_get_match_data() to simplify code 



In the function cpcap_battery_probe(), the driver only needs the
data object, so use device_get_match_data() instead, to make the
code cleaner.

Signed-off-by: default avatarTang Bin <tangbin@cmss.chinamobile.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent d0c27c92

drivers/power/supply/cpcap-battery.c

+4 −11
Original line number Diff line number Diff line
@@ -1026,20 +1026,13 @@ static const struct power_supply_desc cpcap_charger_battery_desc = { 
static int cpcap_battery_probe(struct platform_device *pdev)

{

	struct cpcap_battery_ddata *ddata;

	const struct of_device_id *match;

	struct power_supply_config psy_cfg = {};

	int error;

	const struct cpcap_battery_config *cfg;



	match = of_match_device(of_match_ptr(cpcap_battery_id_table),

				&pdev->dev);

	if (!match)

		return -EINVAL;



	if (!match->data) {

		dev_err(&pdev->dev, "no configuration data found\n");



	cfg = device_get_match_data(&pdev->dev);

	if (!cfg)

		return -ENODEV;

	}



	ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);

	if (!ddata)
@@ -1047,7 +1040,7 @@ static int cpcap_battery_probe(struct platform_device *pdev) 


	INIT_LIST_HEAD(&ddata->irq_list);

	ddata->dev = &pdev->dev;

	memcpy(&ddata->config, match->data, sizeof(ddata->config));

	memcpy(&ddata->config, cfg, sizeof(ddata->config));



	ddata->reg = dev_get_regmap(ddata->dev->parent, NULL);

	if (!ddata->reg)