[PATCH v2 5/5]nbd: use device_attr macros for sysfs attribute

Pranay Kr. Srivastava
2016-06-02T15:26:41Z

This patch changes the pid sysfs device attribute to use
DEVICE_ATTR_* macro.

Signed-off-by: Pranay Kr. Srivastava <pranjas@gmail.com>
---
drivers/block/nbd.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 4da40dc..323ab26 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -449,10 +449,8 @@ static ssize_t pid_show(struct device *dev,
return sprintf(buf, "%d\n", task_pid_nr(nbd->task_recv));
}

-static struct device_attribute pid_attr = {
- .attr = { .name = "pid", .mode = S_IRUGO},
- .show = pid_show,
-};
+
+static DEVICE_ATTR_RO(pid);

static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)
{
@@ -465,7 +463,7 @@ static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)

nbd->task_recv = current;

- ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
+ ret = device_create_file(disk_to_dev(nbd->disk), &dev_attr_pid);
if (ret) {
dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");

@@ -488,7 +486,7 @@ static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)

nbd_size_clear(nbd, bdev);

- device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
+ device_remove_file(disk_to_dev(nbd->disk), &dev_attr_pid);

nbd->task_recv = NULL;

--
2.6.2