Prev: mfd/mc13783: new function exposing flags
Next: [PATCH -mm 0/5] towards I/O aware memory cgroup v3.
From: Samuel Ortiz on 2 Aug 2010 06:10
Hi Uwe,

On Mon, Aug 02, 2010 at 11:14:18AM +0200, Uwe Kleine-K�nig wrote:
> 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.
That's correct, patch applied.
As I said, we can now move mc13783-private.h to drivers/mfd/

Cheers,
Samuel.


> Signed-off-by: Uwe Kleine-K�nig <u.kleine-koenig(a)pengutronix.de>
> ---
> drivers/hwmon/mc13783-adc.c | 17 +++++++++++++----
> 1 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13783-adc.c
> index ce3c7bc..d5226c9 100644
> --- a/drivers/hwmon/mc13783-adc.c
> +++ b/drivers/hwmon/mc13783-adc.c
> @@ -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);
> --
> 1.7.1
>

--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: mfd/mc13783: new function exposing flags
Next: [PATCH -mm 0/5] towards I/O aware memory cgroup v3.