On 07/25/2013 07:05 AM, Greg Kroah-Hartman wrote: > The dev_attrs field of struct class is going away soon, dev_groups > should be used instead. This converts the extcon_class code to use the > correct field. > > Cc: MyungJoo Ham <[email protected]> > Cc: Chanwoo Choi <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > --- > MyungJoo, feel free to apply this to your tree, or ACK it and I can take it > through mine. > > drivers/extcon/extcon-class.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c > index 18ccadef..022ca369 100644 > --- a/drivers/extcon/extcon-class.c > +++ b/drivers/extcon/extcon-class.c > @@ -148,6 +148,7 @@ static ssize_t state_store(struct device *dev, struct > device_attribute *attr, > > return count; > } > +static DEVICE_ATTR_RW(state); > > static ssize_t name_show(struct device *dev, struct device_attribute *attr, > char *buf) > @@ -163,6 +164,7 @@ static ssize_t name_show(struct device *dev, struct > device_attribute *attr, > > return sprintf(buf, "%s\n", dev_name(edev->dev)); > } > +static DEVICE_ATTR_RO(name); > > static ssize_t cable_name_show(struct device *dev, > struct device_attribute *attr, char *buf) > @@ -527,11 +529,12 @@ int extcon_unregister_notifier(struct extcon_dev *edev, > } > EXPORT_SYMBOL_GPL(extcon_unregister_notifier); > > -static struct device_attribute extcon_attrs[] = { > - __ATTR(state, S_IRUGO | S_IWUSR, state_show, state_store), > - __ATTR_RO(name), > - __ATTR_NULL, > +static struct attribute *extcon_attrs[] = { > + &dev_attr_state.attr, > + &dev_attr_name.attr, > + NULL, > }; > +ATTRIBUTE_GROUPS(extcon); > > static int create_extcon_class(void) > { > @@ -539,7 +542,7 @@ static int create_extcon_class(void) > extcon_class = class_create(THIS_MODULE, "extcon"); > if (IS_ERR(extcon_class)) > return PTR_ERR(extcon_class); > - extcon_class->dev_attrs = extcon_attrs; > + extcon_class->dev_groups = extcon_groups; > > #if defined(CONFIG_ANDROID) > switch_class = class_compat_register("switch"); >
Looks good to me. I tested this patch. Acked-by: Chanwoo Choi<[email protected]> Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
