Re: [PATCH 08/16] powerpc: ps3: use dev_groups and not dev_attrs for bus_type
On Tue, Jun 06, 2017 at 09:22:13PM +0200, Greg Kroah-Hartman wrote: > The dev_attrs field has long been "depreciated" and is finally being > removed, so move the driver to use the "correct" dev_groups field > instead for struct bus_type. > > Cc: Geoff Levand> Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > Cc: Michael Ellerman > Cc: > Signed-off-by: Greg Kroah-Hartman > --- > arch/powerpc/platforms/ps3/system-bus.c | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/platforms/ps3/system-bus.c > b/arch/powerpc/platforms/ps3/system-bus.c > index 2d2e5f80a3d3..3e98b4ea3df9 100644 > --- a/arch/powerpc/platforms/ps3/system-bus.c > +++ b/arch/powerpc/platforms/ps3/system-bus.c > @@ -471,11 +471,13 @@ static ssize_t modalias_show(struct device *_dev, > struct device_attribute *a, > > return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; > } > +static DEVICE_ATTR_RO(modalias); > > -static struct device_attribute ps3_system_bus_dev_attrs[] = { > - __ATTR_RO(modalias), > - __ATTR_NULL, > +static struct attribute *ps3_system_bus_dev_attrs[] = { > + _attr_modalias.attr, > + NULL, > }; > +ATTRIBUTE_GROUPS(ps3_system_bus); This should be: ATTRIBUTE_GROUPS(ps3_system_bus_dev); I've fixed it up and am now running it through 0-day. thanks, greg k-h
Re: [PATCH 08/16] powerpc: ps3: use dev_groups and not dev_attrs for bus_type
On 06/06/2017 12:22 PM, Greg Kroah-Hartman wrote: > The dev_attrs field has long been "depreciated" and is finally being > removed, so move the driver to use the "correct" dev_groups field > instead for struct bus_type. > arch/powerpc/platforms/ps3/system-bus.c | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) Seems OK. -Geoff
[PATCH 08/16] powerpc: ps3: use dev_groups and not dev_attrs for bus_type
The dev_attrs field has long been "depreciated" and is finally being removed, so move the driver to use the "correct" dev_groups field instead for struct bus_type. Cc: Geoff LevandCc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/ps3/system-bus.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index 2d2e5f80a3d3..3e98b4ea3df9 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c @@ -471,11 +471,13 @@ static ssize_t modalias_show(struct device *_dev, struct device_attribute *a, return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; } +static DEVICE_ATTR_RO(modalias); -static struct device_attribute ps3_system_bus_dev_attrs[] = { - __ATTR_RO(modalias), - __ATTR_NULL, +static struct attribute *ps3_system_bus_dev_attrs[] = { + _attr_modalias.attr, + NULL, }; +ATTRIBUTE_GROUPS(ps3_system_bus); struct bus_type ps3_system_bus_type = { .name = "ps3_system_bus", @@ -484,7 +486,7 @@ struct bus_type ps3_system_bus_type = { .probe = ps3_system_bus_probe, .remove = ps3_system_bus_remove, .shutdown = ps3_system_bus_shutdown, - .dev_attrs = ps3_system_bus_dev_attrs, + .dev_groups = ps3_system_bus_dev_groups, }; static int __init ps3_system_bus_init(void) -- 2.13.0