Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfb74916 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: ds1685: use rtc_add_group 



Use rtc_add_group to add the sysfs group in a race free manner.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 482419e1

drivers/rtc/rtc-ds1685.c

+1 −39
Original line number Original line Diff line number Diff line
@@ -995,7 +995,6 @@ static int ds1685_nvram_write(void *priv, unsigned int pos, void *val, 
/* ----------------------------------------------------------------------- */

/* ----------------------------------------------------------------------- */

/* SysFS interface */

/* SysFS interface */





#ifdef CONFIG_SYSFS

/**

/**

 * ds1685_rtc_sysfs_battery_show - sysfs file for main battery status.

 * ds1685_rtc_sysfs_battery_show - sysfs file for main battery status.

 * @dev: pointer to device structure.

 * @dev: pointer to device structure.
@@ -1079,37 +1078,6 @@ ds1685_rtc_sysfs_misc_grp = { 
	.attrs = ds1685_rtc_sysfs_misc_attrs,

	.attrs = ds1685_rtc_sysfs_misc_attrs,

};

};





/**

 * ds1685_rtc_sysfs_register - register sysfs files.

 * @dev: pointer to device structure.

 */

static int

ds1685_rtc_sysfs_register(struct device *dev)

{

	int ret = 0;



	ret = sysfs_create_group(&dev->kobj, &ds1685_rtc_sysfs_misc_grp);

	if (ret)

		return ret;



	return 0;

}



/**

 * ds1685_rtc_sysfs_unregister - unregister sysfs files.

 * @dev: pointer to device structure.

 */

static int

ds1685_rtc_sysfs_unregister(struct device *dev)

{

	sysfs_remove_group(&dev->kobj, &ds1685_rtc_sysfs_misc_grp);



	return 0;

}

#endif /* CONFIG_SYSFS */







/* ----------------------------------------------------------------------- */

/* ----------------------------------------------------------------------- */

/* Driver Probe/Removal */

/* Driver Probe/Removal */
@@ -1390,11 +1358,9 @@ ds1685_rtc_probe(struct platform_device *pdev) 
	/* Setup complete. */

	/* Setup complete. */

	ds1685_rtc_switch_to_bank0(rtc);

	ds1685_rtc_switch_to_bank0(rtc);





#ifdef CONFIG_SYSFS

	ret = rtc_add_group(rtc_dev, &ds1685_rtc_sysfs_misc_grp);

	ret = ds1685_rtc_sysfs_register(&pdev->dev);

	if (ret)

	if (ret)

		return ret;

		return ret;

#endif





	rtc_dev->nvram_old_abi = true;

	rtc_dev->nvram_old_abi = true;

	nvmem_cfg.priv = rtc;

	nvmem_cfg.priv = rtc;
@@ -1414,10 +1380,6 @@ ds1685_rtc_remove(struct platform_device *pdev) 
{

{

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);





#ifdef CONFIG_SYSFS

	ds1685_rtc_sysfs_unregister(&pdev->dev);

#endif



	/* Read Ctrl B and clear PIE/AIE/UIE. */

	/* Read Ctrl B and clear PIE/AIE/UIE. */

	rtc->write(rtc, RTC_CTRL_B,

	rtc->write(rtc, RTC_CTRL_B,

		   (rtc->read(rtc, RTC_CTRL_B) &

		   (rtc->read(rtc, RTC_CTRL_B) &