From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964799AbcFBP0l (ORCPT ); Thu, 2 Jun 2016 11:26:41 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33268 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161147AbcFBP0i (ORCPT ); Thu, 2 Jun 2016 11:26:38 -0400 From: "Pranay Kr. Srivastava" To: mpa@pengutronix.de, nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Cc: "Pranay Kr. Srivastava" Subject: [PATCH v2 5/5]nbd: use device_attr macros for sysfs attribute Date: Thu, 2 Jun 2016 13:25:01 +0300 Message-Id: <1464863101-16805-6-git-send-email-pranjas@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1464863101-16805-1-git-send-email-pranjas@gmail.com> References: <3898019.JRqDjBPssX@adelgunde> <1464863101-16805-1-git-send-email-pranjas@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch changes the pid sysfs device attribute to use DEVICE_ATTR_* macro. Signed-off-by: Pranay Kr. Srivastava --- 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