Commit 451ba0e4 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Sebastian Reichel
Browse files

power: supply: pcf50633: fix race-condition in sysfs registration 



This registers custom sysfs properties using the native functionality
of the power-supply framework, which cleans up the code a bit and
fixes a race-condition. Before this patch the sysfs attributes were
not properly registered to udev.

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

drivers/power/supply/pcf50633-charger.c

+7 −10
Original line number Diff line number Diff line
@@ -245,17 +245,14 @@ static ssize_t set_chglim(struct device *dev, 
 */

static DEVICE_ATTR(chg_curlim, S_IRUGO | S_IWUSR, show_chglim, set_chglim);



static struct attribute *pcf50633_mbc_sysfs_entries[] = {

static struct attribute *pcf50633_mbc_sysfs_attrs[] = {

	&dev_attr_chgmode.attr,

	&dev_attr_usb_curlim.attr,

	&dev_attr_chg_curlim.attr,

	NULL,

};



static const struct attribute_group mbc_attr_group = {

	.name	= NULL,			/* put in device directory */

	.attrs	= pcf50633_mbc_sysfs_entries,

};

ATTRIBUTE_GROUPS(pcf50633_mbc_sysfs);



static void

pcf50633_mbc_irq_handler(int irq, void *data)
@@ -390,6 +387,7 @@ static const struct power_supply_desc pcf50633_mbc_ac_desc = { 
static int pcf50633_mbc_probe(struct platform_device *pdev)

{

	struct power_supply_config psy_cfg = {};

	struct power_supply_config usb_psy_cfg;

	struct pcf50633_mbc *mbc;

	int i;

	u8 mbcs1;
@@ -419,8 +417,11 @@ static int pcf50633_mbc_probe(struct platform_device *pdev) 
		return PTR_ERR(mbc->adapter);

	}



	usb_psy_cfg = psy_cfg;

	usb_psy_cfg.attr_grp = pcf50633_mbc_sysfs_groups;



	mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc,

					 &psy_cfg);

					 &usb_psy_cfg);

	if (IS_ERR(mbc->usb)) {

		dev_err(mbc->pcf->dev, "failed to register usb\n");

		power_supply_unregister(mbc->adapter);
@@ -436,9 +437,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev) 
		return PTR_ERR(mbc->ac);

	}



	if (sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group))

		dev_err(mbc->pcf->dev, "failed to create sysfs entries\n");



	mbcs1 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS1);

	if (mbcs1 & PCF50633_MBCS1_USBPRES)

		pcf50633_mbc_irq_handler(PCF50633_IRQ_USBINS, mbc);
@@ -457,7 +455,6 @@ static int pcf50633_mbc_remove(struct platform_device *pdev) 
	for (i = 0; i < ARRAY_SIZE(mbc_irq_handlers); i++)

		pcf50633_free_irq(mbc->pcf, mbc_irq_handlers[i]);



	sysfs_remove_group(&pdev->dev.kobj, &mbc_attr_group);

	power_supply_unregister(mbc->usb);

	power_supply_unregister(mbc->adapter);

	power_supply_unregister(mbc->ac);

CRA Git | Maintained and supported by SUSTech CRA and CCSE