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

Commit eaf06ee2 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Samuel Ortiz
Browse files

hwmon: Don't access struct mc13783 directly from mc13783-adc 



There is a shiny new mc13783 API function that can be used instead.

While at it refactor the code a bit to reduce code duplication a bit.

This removes the last user of <linux/mfd/mc13783-private.h> and so this
include file can go away.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3b16bb53

drivers/hwmon/mc13783-adc.c

+13 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

 */



#include <linux/mfd/mc13783-private.h>

#include <linux/mfd/mc13783.h>

#include <linux/platform_device.h>

#include <linux/hwmon-sysfs.h>

#include <linux/kernel.h>
@@ -144,6 +144,14 @@ static const struct attribute_group mc13783_group_ts = { 
	.attrs = mc13783_attr_ts,

};



static int mc13783_adc_use_touchscreen(struct platform_device *pdev)

{

	struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);

	unsigned flags = mc13783_get_flags(priv->mc13783);



	return flags & MC13783_USE_TOUCHSCREEN;

}



static int __init mc13783_adc_probe(struct platform_device *pdev)

{

	struct mc13783_adc_priv *priv;
@@ -162,10 +170,11 @@ static int __init mc13783_adc_probe(struct platform_device *pdev) 
	if (ret)

		goto out_err_create1;



	if (!(priv->mc13783->flags & MC13783_USE_TOUCHSCREEN))

	if (!mc13783_adc_use_touchscreen(pdev)) {

		ret = sysfs_create_group(&pdev->dev.kobj, &mc13783_group_ts);

		if (ret)

			goto out_err_create2;

	}



	priv->hwmon_dev = hwmon_device_register(&pdev->dev);

	if (IS_ERR(priv->hwmon_dev)) {
@@ -180,7 +189,7 @@ static int __init mc13783_adc_probe(struct platform_device *pdev) 


out_err_register:



	if (!(priv->mc13783->flags & MC13783_USE_TOUCHSCREEN))

	if (!mc13783_adc_use_touchscreen(pdev))

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

out_err_create2:
@@ -199,7 +208,7 @@ static int __devexit mc13783_adc_remove(struct platform_device *pdev) 


	hwmon_device_unregister(priv->hwmon_dev);



	if (!(priv->mc13783->flags & MC13783_USE_TOUCHSCREEN))

	if (!mc13783_adc_use_touchscreen(pdev))

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



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