Skip to contentSkip to conversation

staging: fbtft: replace __ATTR() with DEVICE_ATTR()

PATCH In review Aishwarya Pant 2 participants 4 messages Dec 11, 2017 – Dec 14, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: fbtft: replace __ATTR() with DEVICE_ATTR()

This is a clean-up patch which replaces the uses of raw __ATTR(...) macro with the more conventional DEVICE_ATTR(...) for defining device attributes.

Done using coccinelle-

@r@
identifier foo, n;
@@

struct device_attribute foo = __ATTR(n, ...);

@script:python p@
id;
foo << r.foo;
n << r.n;
@@

// standardise the variable name to dev_attr_{name} coccinelle.id = "dev_attr_" + n

@@
identifier r.foo;
declarer name DEVICE_ATTR;
@@

//change definition
- struct device_attribute foo = __ATTR
+ DEVICE_ATTR

	(...);

@depends on r@
identifier r.foo, p.id;
@@

// replace usages everywhere
- foo
+ id

---
 drivers/staging/fbtft/fbtft-sysfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/fbtft/fbtft-sysfs.c +3 -4
index 712096659aa0..506d604d01bb 100644
@@ -197,19 +197,18 @@ static ssize_t show_debug(struct device *device,
 	return snprintf(buf, PAGE_SIZE, "%lu\n", par->debug);
 }
 
-static struct device_attribute debug_device_attr =
-	__ATTR(debug, 0660, show_debug, store_debug);
+static DEVICE_ATTR(debug, 0660, show_debug, store_debug);
 
 void fbtft_sysfs_init(struct fbtft_par *par)
 {
-	device_create_file(par->info->dev, &debug_device_attr);
+	device_create_file(par->info->dev, &dev_attr_debug);
 	if (par->gamma.curves && par->fbtftops.set_gamma)
 		device_create_file(par->info->dev, &gamma_device_attrs[0]);
 }
 
 void fbtft_sysfs_exit(struct fbtft_par *par)
 {
-	device_remove_file(par->info->dev, &debug_device_attr);
+	device_remove_file(par->info->dev, &dev_attr_debug);
 	if (par->gamma.curves && par->fbtftops.set_gamma)
 		device_remove_file(par->info->dev, &gamma_device_attrs[0]);
 }
Signature · 1 line
2.15.1
#1 lore raw
Quoted 49 lines · Aishwarya Pant

This is a clean-up patch which replaces the uses of raw __ATTR(...) macro with the more conventional DEVICE_ATTR(...) for defining device attributes.

Done using coccinelle-

@r@
identifier foo, n;
@@

struct device_attribute foo = __ATTR(n, ...);

@script:python p@
id;
foo << r.foo;
n << r.n;
@@

// standardise the variable name to dev_attr_{name} coccinelle.id = "dev_attr_" + n

@@
identifier r.foo;
declarer name DEVICE_ATTR;
@@

//change definition
- struct device_attribute foo = __ATTR
+ DEVICE_ATTR

	(...);

@depends on r@
identifier r.foo, p.id;
@@

// replace usages everywhere
- foo
+ id

---
 drivers/staging/fbtft/fbtft-sysfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/fbtft/fbtft-sysfs.c +0 -0
index 712096659aa0..506d604d01bb 100644

drivers/staging/fbtft/fbtft-sysfs.c static ssize_t show_debug(struct device *device, · line 200

Quoted 6 lines
drivers/staging/fbtft/fbtft-sysfs.c +1 -2
@@ -197,19 +197,18 @@ static ssize_t show_debug(struct device *device,
 	return snprintf(buf, PAGE_SIZE, "%lu\n", par->debug);
 }
 
-static struct device_attribute debug_device_attr =
-	__ATTR(debug, 0660, show_debug, store_debug);
+static DEVICE_ATTR(debug, 0660, show_debug, store_debug);

This should be DEVICE_ATTR_RW(), right? 0660 makes no sense...

thanks,

greg k-h

#2 lore raw
Quoted 53 lines · Greg Kroah-Hartman
Quoted 52 lines · Aishwarya Pant

This is a clean-up patch which replaces the uses of raw __ATTR(...) macro with the more conventional DEVICE_ATTR(...) for defining device attributes.

Done using coccinelle-

@r@
identifier foo, n;
@@

struct device_attribute foo = __ATTR(n, ...);

@script:python p@
id;
foo << r.foo;
n << r.n;
@@

// standardise the variable name to dev_attr_{name} coccinelle.id = "dev_attr_" + n

@@
identifier r.foo;
declarer name DEVICE_ATTR;
@@

//change definition
- struct device_attribute foo = __ATTR
+ DEVICE_ATTR

	(...);

@depends on r@
identifier r.foo, p.id;
@@

// replace usages everywhere
- foo
+ id

---
 drivers/staging/fbtft/fbtft-sysfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/fbtft/fbtft-sysfs.c +0 -0
index 712096659aa0..506d604d01bb 100644
@@ -197,19 +197,18 @@ static ssize_t show_debug(struct device *device,
 	return snprintf(buf, PAGE_SIZE, "%lu\n", par->debug);
 }
 
Quoted 5 lines

drivers/staging/fbtft/fbtft-sysfs.c static ssize_t show_debug(struct device *device, · line 200

Quoted 3 lines
drivers/staging/fbtft/fbtft-sysfs.c +1 -2
-static struct device_attribute debug_device_attr =
-	__ATTR(debug, 0660, show_debug, store_debug);
+static DEVICE_ATTR(debug, 0660, show_debug, store_debug);

This should be DEVICE_ATTR_RW(), right? 0660 makes no sense...

If it doesn't make sense here, I can replace it with DEVICE_ATTR_RW. Though, 0660 has more open permissions than 0644.

Quoted 4 lines

thanks,

greg k-h

#3 lore raw
Quoted 54 lines · Aishwarya Pant
Quoted 53 lines · Greg Kroah-Hartman
Quoted 52 lines · Aishwarya Pant

This is a clean-up patch which replaces the uses of raw __ATTR(...) macro with the more conventional DEVICE_ATTR(...) for defining device attributes.

Done using coccinelle-

@r@
identifier foo, n;
@@

struct device_attribute foo = __ATTR(n, ...);

@script:python p@
id;
foo << r.foo;
n << r.n;
@@

// standardise the variable name to dev_attr_{name} coccinelle.id = "dev_attr_" + n

@@
identifier r.foo;
declarer name DEVICE_ATTR;
@@

//change definition
- struct device_attribute foo = __ATTR
+ DEVICE_ATTR

	(...);

@depends on r@
identifier r.foo, p.id;
@@

// replace usages everywhere
- foo
+ id

---
 drivers/staging/fbtft/fbtft-sysfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/fbtft/fbtft-sysfs.c +0 -0
index 712096659aa0..506d604d01bb 100644
@@ -197,19 +197,18 @@ static ssize_t show_debug(struct device *device,
 	return snprintf(buf, PAGE_SIZE, "%lu\n", par->debug);
 }
 
Quoted 8 lines
Quoted 5 lines

drivers/staging/fbtft/fbtft-sysfs.c static ssize_t show_debug(struct device *device, · line 200

Quoted 3 lines
drivers/staging/fbtft/fbtft-sysfs.c +1 -2
-static struct device_attribute debug_device_attr =
-	__ATTR(debug, 0660, show_debug, store_debug);
+static DEVICE_ATTR(debug, 0660, show_debug, store_debug);

This should be DEVICE_ATTR_RW(), right? 0660 makes no sense...

If it doesn't make sense here, I can replace it with DEVICE_ATTR_RW. Though, 0660 has more open permissions than 0644.

Unless there is a really good reason for keeping an "odd" sysfs file mode, use the default permissions. As this is just a debug flag, 0644 makes a lot more sense, don't you think?

Actually, just drop this whole attribute. Random "turn on debugging" config files do not even belong in sysfs. We have a kernel-wide infrastructure for all of that already, no single driver, or tiny subsystem, should have their own custom way of doing this.

thanks,

greg k-h