[v2] xen: xen-pciback: remove DRIVER_ATTR() usage

Commit Message

Greg Kroah-Hartman July 19, 2017, 2:43 p.m. UTC

From: Greg Kroah-Hartman <[e-mail]>

It's better to be explicit and use the DRIVER_ATTR_RW() and
DRIVER_ATTR_RO() macros when defining a driver's sysfs file.

Bonus is this fixes up a checkpatch.pl warning.

This is part of a series to drop DRIVER_ATTR() from the tree entirely.

Cc: Boris Ostrovsky <[e-mail]>
Cc: Juergen Gross <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>
---
v2: fix build error (quirks_store was wrong), thanks to Juergen for the
    catch, it's now correctly build tested locally...

 drivers/xen/xen-pciback/pci_stub.c |   44 ++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

Comments

Jürgen Groß July 19, 2017, 2:51 p.m. UTC | #1

On 19/07/17 16:43, Greg KH wrote:
> From: Greg Kroah-Hartman <[e-mail]>
> 
> It's better to be explicit and use the DRIVER_ATTR_RW() and
> DRIVER_ATTR_RO() macros when defining a driver's sysfs file.
> 
> Bonus is this fixes up a checkpatch.pl warning.
> 
> This is part of a series to drop DRIVER_ATTR() from the tree entirely.
> 
> Cc: Boris Ostrovsky <[e-mail]>
> Cc: Juergen Gross <[e-mail]>
> Signed-off-by: Greg Kroah-Hartman <[e-mail]>

Reviewed-by: Juergen Gross <[e-mail]>

I'll take this through the Xen tree, unless you want to use your tree.


Thanks,

Juergen

Greg Kroah-Hartman July 19, 2017, 3:17 p.m. UTC | #2

On Wed, Jul 19, 2017 at 04:51:02PM +0200, Juergen Gross wrote:
> On 19/07/17 16:43, Greg KH wrote:
> > From: Greg Kroah-Hartman <[e-mail]>
> > 
> > It's better to be explicit and use the DRIVER_ATTR_RW() and
> > DRIVER_ATTR_RO() macros when defining a driver's sysfs file.
> > 
> > Bonus is this fixes up a checkpatch.pl warning.
> > 
> > This is part of a series to drop DRIVER_ATTR() from the tree entirely.
> > 
> > Cc: Boris Ostrovsky <[e-mail]>
> > Cc: Juergen Gross <[e-mail]>
> > Signed-off-by: Greg Kroah-Hartman <[e-mail]>
> 
> Reviewed-by: Juergen Gross <[e-mail]>
> 
> I'll take this through the Xen tree, unless you want to use your tree.

If I can take it through mine, then I could drop DRIVER_ATTR() from the
whole tree for the next kernel release, which would be ideal.

But if you want to take it, that's fine, I can wait another release, no
rush.

thanks,

greg k-h

Jürgen Groß July 19, 2017, 5:20 p.m. UTC | #3

On 19/07/17 17:17, Greg KH wrote:
> On Wed, Jul 19, 2017 at 04:51:02PM +0200, Juergen Gross wrote:
>> On 19/07/17 16:43, Greg KH wrote:
>>> From: Greg Kroah-Hartman <[e-mail]>
>>>
>>> It's better to be explicit and use the DRIVER_ATTR_RW() and
>>> DRIVER_ATTR_RO() macros when defining a driver's sysfs file.
>>>
>>> Bonus is this fixes up a checkpatch.pl warning.
>>>
>>> This is part of a series to drop DRIVER_ATTR() from the tree entirely.
>>>
>>> Cc: Boris Ostrovsky <[e-mail]>
>>> Cc: Juergen Gross <[e-mail]>
>>> Signed-off-by: Greg Kroah-Hartman <[e-mail]>
>>
>> Reviewed-by: Juergen Gross <[e-mail]>
>>
>> I'll take this through the Xen tree, unless you want to use your tree.
> 
> If I can take it through mine, then I could drop DRIVER_ATTR() from the
> whole tree for the next kernel release, which would be ideal.
> 
> But if you want to take it, that's fine, I can wait another release, no
> rush.

In this case just use your tree. I don't think there are any pending
conflicting patches right now.


Juergen

Patch

--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -1172,8 +1172,8 @@  out:
 	return err;
 }
 
-static ssize_t pcistub_slot_add(struct device_driver *drv, const char *buf,
-				size_t count)
+static ssize_t new_slot_store(struct device_driver *drv, const char *buf,
+			      size_t count)
 {
 	int domain, bus, slot, func;
 	int err;
@@ -1189,10 +1189,10 @@  out:
 		err = count;
 	return err;
 }
-static DRIVER_ATTR(new_slot, S_IWUSR, NULL, pcistub_slot_add);
+static DRIVER_ATTR_WO(new_slot);
 
-static ssize_t pcistub_slot_remove(struct device_driver *drv, const char *buf,
-				   size_t count)
+static ssize_t remove_slot_store(struct device_driver *drv, const char *buf,
+				 size_t count)
 {
 	int domain, bus, slot, func;
 	int err;
@@ -1208,9 +1208,9 @@  out:
 		err = count;
 	return err;
 }
-static DRIVER_ATTR(remove_slot, S_IWUSR, NULL, pcistub_slot_remove);
+static DRIVER_ATTR_WO(remove_slot);
 
-static ssize_t pcistub_slot_show(struct device_driver *drv, char *buf)
+static ssize_t slots_show(struct device_driver *drv, char *buf)
 {
 	struct pcistub_device_id *pci_dev_id;
 	size_t count = 0;
@@ -1231,9 +1231,9 @@  static ssize_t pcistub_slot_show(struct
 
 	return count;
 }
-static DRIVER_ATTR(slots, S_IRUSR, pcistub_slot_show, NULL);
+static DRIVER_ATTR_RO(slots);
 
-static ssize_t pcistub_irq_handler_show(struct device_driver *drv, char *buf)
+static ssize_t irq_handlers_show(struct device_driver *drv, char *buf)
 {
 	struct pcistub_device *psdev;
 	struct xen_pcibk_dev_data *dev_data;
@@ -1260,11 +1260,10 @@  static ssize_t pcistub_irq_handler_show(
 	spin_unlock_irqrestore(&pcistub_devices_lock, flags);
 	return count;
 }
-static DRIVER_ATTR(irq_handlers, S_IRUSR, pcistub_irq_handler_show, NULL);
+static DRIVER_ATTR_RO(irq_handlers);
 
-static ssize_t pcistub_irq_handler_switch(struct device_driver *drv,
-					  const char *buf,
-					  size_t count)
+static ssize_t irq_handler_state_store(struct device_driver *drv,
+				       const char *buf, size_t count)
 {
 	struct pcistub_device *psdev;
 	struct xen_pcibk_dev_data *dev_data;
@@ -1301,11 +1300,10 @@  out:
 		err = count;
 	return err;
 }
-static DRIVER_ATTR(irq_handler_state, S_IWUSR, NULL,
-		   pcistub_irq_handler_switch);
+static DRIVER_ATTR_WO(irq_handler_state);
 
-static ssize_t pcistub_quirk_add(struct device_driver *drv, const char *buf,
-				 size_t count)
+static ssize_t quirks_store(struct device_driver *drv, const char *buf,
+			    size_t count)
 {
 	int domain, bus, slot, func, reg, size, mask;
 	int err;
@@ -1323,7 +1321,7 @@  out:
 	return err;
 }
 
-static ssize_t pcistub_quirk_show(struct device_driver *drv, char *buf)
+static ssize_t quirks_show(struct device_driver *drv, char *buf)
 {
 	int count = 0;
 	unsigned long flags;
@@ -1366,11 +1364,10 @@  out:
 
 	return count;
 }
-static DRIVER_ATTR(quirks, S_IRUSR | S_IWUSR, pcistub_quirk_show,
-		   pcistub_quirk_add);
+static DRIVER_ATTR_RW(quirks);
 
-static ssize_t permissive_add(struct device_driver *drv, const char *buf,
-			      size_t count)
+static ssize_t permissive_store(struct device_driver *drv, const char *buf,
+				size_t count)
 {
 	int domain, bus, slot, func;
 	int err;
@@ -1431,8 +1428,7 @@  static ssize_t permissive_show(struct de
 	spin_unlock_irqrestore(&pcistub_devices_lock, flags);
 	return count;
 }
-static DRIVER_ATTR(permissive, S_IRUSR | S_IWUSR, permissive_show,
-		   permissive_add);
+static DRIVER_ATTR_RW(permissive);
 
 static void pcistub_exit(void)
 {