2011-02-16 22:23:41

by Marc Kleine-Budde

Subject: [PATCH v2] Driver core: convert platform_{get,set}_drvdata to static inline functions

This patch converts the macros for platform_{get,set}_drvdata to
static inline functions to add typechecking.

Signed-off-by: Marc Kleine-Budde <[email protected]>
---
Changes since v1:
- remove ugly macro magic, use static inline functions instead

include/linux/platform_device.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 2e700ec..d96db98 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -130,8 +130,15 @@ extern void platform_driver_unregister(struct platform_driver *);
extern int platform_driver_probe(struct platform_driver *driver,
int (*probe)(struct platform_device *));

-#define platform_get_drvdata(_dev) dev_get_drvdata(&(_dev)->dev)
-#define platform_set_drvdata(_dev,data) dev_set_drvdata(&(_dev)->dev, (data))
+static inline void *platform_get_drvdata(const struct platform_device *pdev)
+{
+ return dev_get_drvdata(&pdev->dev);
+}
+
+static inline void platform_set_drvdata(struct platform_device *pdev, void *data)
+{
+ dev_set_drvdata(&pdev->dev, data);
+}

extern struct platform_device *platform_create_bundle(struct platform_driver *driver,
int (*probe)(struct platform_device *),
--
1.7.2.3

2011-02-16 22:58:00

by Greg KH

Subject: Re: [PATCH v2] Driver core: convert platform_{get,set}_drvdata to static inline functions

On Wed, Feb 16, 2011 at 11:23:27PM +0100, Marc Kleine-Budde wrote:
> This patch converts the macros for platform_{get,set}_drvdata to
> static inline functions to add typechecking.
>
> Signed-off-by: Marc Kleine-Budde <[email protected]>

Much better, I'll add this to my queue.

thanks,

greg k-h

2011-02-17 08:47:10

by Uwe Kleine-König

Subject: Re: [PATCH v2] Driver core: convert platform_{get,set}_drvdata to static inline functions

Hello,

On Wed, Feb 16, 2011 at 11:23:27PM +0100, Marc Kleine-Budde wrote:
> This patch converts the macros for platform_{get,set}_drvdata to
> static inline functions to add typechecking.
>
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> ---
> Changes since v1:
> - remove ugly macro magic, use static inline functions instead
>
> include/linux/platform_device.h | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
> index 2e700ec..d96db98 100644
> --- a/include/linux/platform_device.h
> +++ b/include/linux/platform_device.h
> @@ -130,8 +130,15 @@ extern void platform_driver_unregister(struct platform_driver *);
> extern int platform_driver_probe(struct platform_driver *driver,
> int (*probe)(struct platform_device *));
>
> -#define platform_get_drvdata(_dev) dev_get_drvdata(&(_dev)->dev)
> -#define platform_set_drvdata(_dev,data) dev_set_drvdata(&(_dev)->dev, (data))
> +static inline void *platform_get_drvdata(const struct platform_device *pdev)
> +{
> + return dev_get_drvdata(&pdev->dev);
> +}
> +
> +static inline void platform_set_drvdata(struct platform_device *pdev, void *data)
> +{
> + dev_set_drvdata(&pdev->dev, data);
> +}
Another improvement would be to make dev_set_drvdata and
platform_set_drvdata return an int (as dev_set_drvdata can fail) (and
then maybe mark it __must_check).

Other than that,

Acked-by: Uwe Kleine-K?nig <[email protected]>

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

2011-02-18 16:22:40

by Greg KH

Subject: Re: [PATCH v2] Driver core: convert platform_{get,set}_drvdata to static inline functions

On Thu, Feb 17, 2011 at 09:47:05AM +0100, Uwe Kleine-K?nig wrote:
> Hello,
>
> On Wed, Feb 16, 2011 at 11:23:27PM +0100, Marc Kleine-Budde wrote:
> > This patch converts the macros for platform_{get,set}_drvdata to
> > static inline functions to add typechecking.
> >
> > Signed-off-by: Marc Kleine-Budde <[email protected]>
> > ---
> > Changes since v1:
> > - remove ugly macro magic, use static inline functions instead
> >
> > include/linux/platform_device.h | 11 +++++++++--
> > 1 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
> > index 2e700ec..d96db98 100644
> > --- a/include/linux/platform_device.h
> > +++ b/include/linux/platform_device.h
> > @@ -130,8 +130,15 @@ extern void platform_driver_unregister(struct platform_driver *);
> > extern int platform_driver_probe(struct platform_driver *driver,
> > int (*probe)(struct platform_device *));
> >
> > -#define platform_get_drvdata(_dev) dev_get_drvdata(&(_dev)->dev)
> > -#define platform_set_drvdata(_dev,data) dev_set_drvdata(&(_dev)->dev, (data))
> > +static inline void *platform_get_drvdata(const struct platform_device *pdev)
> > +{
> > + return dev_get_drvdata(&pdev->dev);
> > +}
> > +
> > +static inline void platform_set_drvdata(struct platform_device *pdev, void *data)
> > +{
> > + dev_set_drvdata(&pdev->dev, data);
> > +}
> Another improvement would be to make dev_set_drvdata and
> platform_set_drvdata return an int (as dev_set_drvdata can fail) (and
> then maybe mark it __must_check).

But dev_set_drvdata() does not return anything, so you would also have
to change that function first.

thanks,

greg k-h