Skip to contentSkip to conversation

DMA: ppc4xx: remove DRIVER_ATTR() usage

PATCH In review Greg KH 2 participants 2 messages Jul 19, 2017 – Jul 21, 2017 dmaengine

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 DMA: ppc4xx: remove DRIVER_ATTR() usage

From: Greg Kroah-Hartman <[email protected]>

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 Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/dma/ppc4xx/adma.c |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/dma/ppc4xx/adma.c +10 -13
@@ -4307,7 +4307,7 @@ static int ppc440spe_adma_remove(struct
  * "poly" allows setting/checking used polynomial (for PPC440SPe only).
  */
 
-static ssize_t show_ppc440spe_devices(struct device_driver *dev, char *buf)
+static ssize_t devices_show(struct device_driver *dev, char *buf)
 {
 	ssize_t size = 0;
 	int i;

@@ -4321,16 +4321,17 @@ static ssize_t show_ppc440spe_devices(st
 	}
 	return size;
 }
+static DRIVER_ATTR_RO(devices);
 
-static ssize_t show_ppc440spe_r6enable(struct device_driver *dev, char *buf)
+static ssize_t enable_show(struct device_driver *dev, char *buf)
 {
 	return snprintf(buf, PAGE_SIZE,
 			"PPC440SP(e) RAID-6 capabilities are %sABLED.\n",
 			ppc440spe_r6_enabled ? "EN" : "DIS");
 }
 
-static ssize_t store_ppc440spe_r6enable(struct device_driver *dev,
-					const char *buf, size_t count)
+static ssize_t enable_store(struct device_driver *dev, const char *buf,
+			    size_t count)
 {
 	unsigned long val;
 

@@ -4357,8 +4358,9 @@ static ssize_t store_ppc440spe_r6enable(
 	}
 	return count;
 }
+static DRIVER_ATTR_RW(enable);
 
-static ssize_t show_ppc440spe_r6poly(struct device_driver *dev, char *buf)
+static ssize_t poly_store(struct device_driver *dev, char *buf)
 {
 	ssize_t size = 0;
 	u32 reg;

@@ -4377,8 +4379,8 @@ static ssize_t show_ppc440spe_r6poly(str
 	return size;
 }
 
-static ssize_t store_ppc440spe_r6poly(struct device_driver *dev,
-				      const char *buf, size_t count)
+static ssize_t poly_store(struct device_driver *dev, const char *buf,
+			  size_t count)
 {
 	unsigned long reg, val;
 

@@ -4404,12 +4406,7 @@ static ssize_t store_ppc440spe_r6poly(st
 
 	return count;
 }
-
-static DRIVER_ATTR(devices, S_IRUGO, show_ppc440spe_devices, NULL);
-static DRIVER_ATTR(enable, S_IRUGO | S_IWUSR, show_ppc440spe_r6enable,
-		   store_ppc440spe_r6enable);
-static DRIVER_ATTR(poly, S_IRUGO | S_IWUSR, show_ppc440spe_r6poly,
-		   store_ppc440spe_r6poly);
+static DRIVER_ATTR_RW(poly);
 
 /*
  * Common initialisation for RAID engines; allocate memory for
#1 lore raw
Quoted 6 lines · Greg KH

From: Greg Kroah-Hartman <[email protected]>

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.

Applied after fixing the subsystem name, thanks

Signature · 1 line
~Vinod