Re: [PATCH 05/13] eeepc-laptop: use DEVICE_ATTR to instantiate device_attributes

From: Frans Klaver
Date: Sun Sep 14 2014 - 18:06:24 EST


On Fri, Sep 12, 2014 at 04:28:51PM -0700, Greg Kroah-Hartman wrote:
> On Sat, Sep 13, 2014 at 01:06:44AM +0200, Frans Klaver wrote:
> > Signed-off-by: Frans Klaver <fransklaver@xxxxxxxxx>
> > ---
> > drivers/platform/x86/eeepc-laptop.c | 35 +++++------------------------------
> > 1 file changed, 5 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
> > index f35d008..8225b1e 100644
> > --- a/drivers/platform/x86/eeepc-laptop.c
> > +++ b/drivers/platform/x86/eeepc-laptop.c
> > @@ -308,13 +308,7 @@ static ssize_t show_sys_acpi(struct device *dev, int cm, char *buf)
> > { \
> > return store_sys_acpi(dev, _cm, buf, count); \
> > } \
> > - static struct device_attribute dev_attr_##_name = { \
> > - .attr = { \
> > - .name = __stringify(_name), \
> > - .mode = _mode }, \
> > - .show = show_##_name, \
> > - .store = store_##_name, \
> > - }
> > + static DEVICE_ATTR(_name, _mode, show_##_name, store_##_name)
> >
> > EEEPC_CREATE_DEVICE_ATTR(camera, S_IWUSR | S_IRUGO, CM_ASL_CAMERA);
> > EEEPC_CREATE_DEVICE_ATTR(cardr, S_IWUSR | S_IRUGO, CM_ASL_CARDREADER);
> > @@ -420,29 +414,10 @@ static ssize_t store_cpufv_disabled(struct device *dev,
> > }
> >
> >
> > -static struct device_attribute dev_attr_cpufv = {
> > - .attr = {
> > - .name = "cpufv",
> > - .mode = S_IWUSR | S_IRUGO },
> > - .show = show_cpufv,
> > - .store = store_cpufv
> > -};
> > -
> > -static struct device_attribute dev_attr_available_cpufv = {
> > - .attr = {
> > - .name = "available_cpufv",
> > - .mode = S_IRUGO },
> > - .show = show_available_cpufv
> > -};
> > -
> > -static struct device_attribute dev_attr_cpufv_disabled = {
> > - .attr = {
> > - .name = "cpufv_disabled",
> > - .mode = S_IWUSR | S_IRUGO},
> > - .show = show_cpufv_disabled,
> > - .store = store_cpufv_disabled
> > -};
> > -
> > +static DEVICE_ATTR(cpufv, S_IWUSR | S_IRUGO, show_cpufv, store_cpufv);
>
> DEVICE_ATTR_RW()?
>
> > +static DEVICE_ATTR(available_cpufv, S_IRUGO, show_available_cpufv, NULL);
>
> DEVICE_ATTR_RO()?
>
> > +static DEVICE_ATTR(cpufv_disabled, S_IWUSR | S_IRUGO,
> > + show_cpufv_disabled, store_cpufv_disabled);
>
> DEVICE_ATTR_RW()?

Yes, I could have expected that. v2 will use them across the board.

Thanks,
Frans
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/