From patchwork Wed Jun 16 03:44:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 461339 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp196402jae; Tue, 15 Jun 2021 20:45:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiFpCgI5nTBTqWuVqPqI5fhoU+JLyXo/zQvjETiuoZP3dAjIBCq9QnJaxvRm1zQnuo3vO3 X-Received: by 2002:a92:2a05:: with SMTP id r5mr1876460ile.69.1623815147188; Tue, 15 Jun 2021 20:45:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623815147; cv=none; d=google.com; s=arc-20160816; b=ns4eWVLn1lhogomddRQ3HIPPKtkqX37uQmFNsoaEuCuqV+p+Cjrb7V9JY98HEgu/Br yBrk85v7+3ptyzZKXe4Q3ZpiyLltx8QKiMzUaIoDyDQyM8irSt8Mc4hx4QFYy3R9ahBP cmTke84mmYj/VA7NqpqUnruNr/PROATzr9cESK1JPGfvzhjinjruGrL2heDSP0QIT+Cb KMiSDpCa8fssdYMiqUBK86wRXlDFenMZwQ3kUsl1pS4iLgTSHUe17qjBEjIWEXF+hP4v /7XJVsZfQSYrLuMCq0HMW4Sc435Gy/qFoFpcvnEr3ITohHYVYnzLtGUV1B3YYvo14tA7 bJiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=G6Kh8UomxYpAADO2+HtKnjdZEEfeNa3tN4re6XbH2rc=; b=kS7g4o+z3mmVXT4mJj6eplN37MEFv4NcPzUb77y+Diwm5igKLve0SSapPM/8dRZ/Ld PSf2nXd5IF9YtiWwq5re4bAJf+8b5LUehMOZF7PJlL8cqaJ91eBYDQ/qUd6yeen3Cu8z eFKH8E7gf8Lfr98JTml6wbMuQXRh0n37aYbu4aGVSD7sLsfTga/rybNm42iAlxIvqzsz CU3oUAFm+cnFct4K7PXABmFUH2kMRjJIok5Wvrp5245iY0Eaeqy56nPIT494BIVHg8cb WaaSIlS+fAayX/blDhN9UDMioMgkHxtB0G/P33NWVc8eEjrLFky1zA3kBResvv9hVyAy kS7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si1198777jak.97.2021.06.15.20.45.47 for ; Tue, 15 Jun 2021 20:45:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230211AbhFPDrw (ORCPT ); Tue, 15 Jun 2021 23:47:52 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:7447 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbhFPDrv (ORCPT ); Tue, 15 Jun 2021 23:47:51 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4G4WGx3cc9zZhk2; Wed, 16 Jun 2021 11:42:49 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:44 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:44 +0800 From: Zhen Lei To: Nilesh Javali , Manish Rangankar , Saurav Kashyap , Javed Hasan , Kashyap Desai , "Sumit Saxena" , Shivasharan S , GR-QLogic-Storage-Upstream , "megaraidlinux . pdl" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi CC: Zhen Lei Subject: [PATCH v2 1/4] scsi: qedi: use DEVICE_ATTR_RO macro Date: Wed, 16 Jun 2021 11:44:16 +0800 Message-ID: <20210616034419.725-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210616034419.725-1-thunder.leizhen@huawei.com> References: <20210616034419.725-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use DEVICE_ATTR_RO macro helper instead of plain DEVICE_ATTR, which makes the code a bit shorter and easier to read. Signed-off-by: Zhen Lei --- drivers/scsi/qedi/qedi_sysfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.26.0.106.g9fadedd Acked-by: Manish Rangankar diff --git a/drivers/scsi/qedi/qedi_sysfs.c b/drivers/scsi/qedi/qedi_sysfs.c index 04ee68e6499c912..be174d30eb7c275 100644 --- a/drivers/scsi/qedi/qedi_sysfs.c +++ b/drivers/scsi/qedi/qedi_sysfs.c @@ -16,9 +16,9 @@ static inline struct qedi_ctx *qedi_dev_to_hba(struct device *dev) return iscsi_host_priv(shost); } -static ssize_t qedi_show_port_state(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t port_state_show(struct device *dev, + struct device_attribute *attr, + char *buf) { struct qedi_ctx *qedi = qedi_dev_to_hba(dev); @@ -28,8 +28,8 @@ static ssize_t qedi_show_port_state(struct device *dev, return sprintf(buf, "Linkdown\n"); } -static ssize_t qedi_show_speed(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t speed_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct qedi_ctx *qedi = qedi_dev_to_hba(dev); struct qed_link_output if_link; @@ -39,8 +39,8 @@ static ssize_t qedi_show_speed(struct device *dev, return sprintf(buf, "%d Gbit\n", if_link.speed / 1000); } -static DEVICE_ATTR(port_state, 0444, qedi_show_port_state, NULL); -static DEVICE_ATTR(speed, 0444, qedi_show_speed, NULL); +static DEVICE_ATTR_RO(port_state); +static DEVICE_ATTR_RO(speed); struct device_attribute *qedi_shost_attrs[] = { &dev_attr_port_state, From patchwork Wed Jun 16 03:44:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 461340 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp196422jae; Tue, 15 Jun 2021 20:45:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvqfp+D0G7JRTVlXR5zr++w/CrDY52gl7o7p91/z8KePJ/vaxc2rgg1Djw5e/HMdFSPv73 X-Received: by 2002:a05:6e02:1d03:: with SMTP id i3mr2059858ila.35.1623815149707; Tue, 15 Jun 2021 20:45:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623815149; cv=none; d=google.com; s=arc-20160816; b=poD4GkA+yy+304hBQquVXljxLEYBXNvd/BrWtSGAZrvk0EB6KyWWeCKzVIpKrV61Ib 5WwOFLxBgSbD2KIdAOz1SI4H0d+cFN0oj+/4/bDidI8wt2l87RiwG4qUZrji1/WlYppF 7B8fua8CdH2nWPF7+TpQY7b57tZfvMlE2BvoqAfYm3Wy2NikWPGIjqHyLXcZooZYhsjG dKX34IXhJ/5DSgd4Xt9gtPKTyawCiXE8co4k1Ey6oFZef9bmyssV69JiKHjKvNBrD85h rEIDsSh7m2pHZyhyD2WJ6uj/R0sHgZGsKB6Aeol/ZLhhBiSgptLdhcXOesn03F2B0aTD 4yQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YbKuK733Ah5ceYsH/agcKHQzcxWcpPmh+GjeK+KFdg4=; b=djLAi/aJnNQtv+PQ1jg7tYWx9oUJxsbOkSwdSwXXXwX9WE84DFQFg5uVf6jxBJTwzu 2IVtIgdtCXOKq8LIMHKaq4C/xxCFCALSkxDKPgZRNMHkeR+tPCh+XYO76xNOWrKvDKqD jEguWqshl8ABXYOWCLAhlnx/YDXE4VHUEcd9GXm2Au8noiNhn1GzLN+pyeNUIjN3cDFY lWSaDjX1GHw1rkLtLAMngKeViEwyJ4h49rlMas7IC1b7yIbNVpAy1XjstYfB1RfHYZjM YO313G7GVqs/eH+ygBIPfxQfw6nhVdxFjdcOUhAxLPYOEToHy16ylzHyFzcdA7SgD4cf 5YiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si1198777jak.97.2021.06.15.20.45.49 for ; Tue, 15 Jun 2021 20:45:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230482AbhFPDry (ORCPT ); Tue, 15 Jun 2021 23:47:54 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:7286 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbhFPDry (ORCPT ); Tue, 15 Jun 2021 23:47:54 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4G4WDZ5q2tz1BMVP; Wed, 16 Jun 2021 11:40:46 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:46 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:44 +0800 From: Zhen Lei To: Nilesh Javali , Manish Rangankar , Saurav Kashyap , Javed Hasan , Kashyap Desai , "Sumit Saxena" , Shivasharan S , GR-QLogic-Storage-Upstream , "megaraidlinux . pdl" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi CC: Zhen Lei Subject: [PATCH v2 2/4] scsi: qedf: use DEVICE_ATTR_RO macro Date: Wed, 16 Jun 2021 11:44:17 +0800 Message-ID: <20210616034419.725-3-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210616034419.725-1-thunder.leizhen@huawei.com> References: <20210616034419.725-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use DEVICE_ATTR_RO macro helper instead of plain DEVICE_ATTR, which makes the code a bit shorter and easier to read. Signed-off-by: Zhen Lei --- drivers/scsi/qedf/qedf_attr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) -- 2.26.0.106.g9fadedd diff --git a/drivers/scsi/qedf/qedf_attr.c b/drivers/scsi/qedf/qedf_attr.c index d995f72a67595bd..461c0c9180c444e 100644 --- a/drivers/scsi/qedf/qedf_attr.c +++ b/drivers/scsi/qedf/qedf_attr.c @@ -24,9 +24,8 @@ static struct qedf_ctx *qedf_get_base_qedf(struct qedf_ctx *qedf) return lport_priv(base_lport); } -static ssize_t -qedf_fcoe_mac_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t fcoe_mac_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct fc_lport *lport = shost_priv(class_to_shost(dev)); u32 port_id; @@ -42,9 +41,8 @@ qedf_fcoe_mac_show(struct device *dev, return scnprintf(buf, PAGE_SIZE, "%pM\n", fcoe_mac); } -static ssize_t -qedf_fka_period_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t fka_period_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct fc_lport *lport = shost_priv(class_to_shost(dev)); struct qedf_ctx *qedf = lport_priv(lport); @@ -59,8 +57,8 @@ qedf_fka_period_show(struct device *dev, return scnprintf(buf, PAGE_SIZE, "%d\n", fka_period); } -static DEVICE_ATTR(fcoe_mac, S_IRUGO, qedf_fcoe_mac_show, NULL); -static DEVICE_ATTR(fka_period, S_IRUGO, qedf_fka_period_show, NULL); +static DEVICE_ATTR_RO(fcoe_mac); +static DEVICE_ATTR_RO(fka_period); struct device_attribute *qedf_host_attrs[] = { &dev_attr_fcoe_mac, From patchwork Wed Jun 16 03:44:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 461343 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp196453jae; Tue, 15 Jun 2021 20:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwniruZNp9lzKIdLD2VKG77IVnB++FNGhQTdx3BuwnIQmmZoK7UyMbB7UIrQibQh4Z3kpJ2 X-Received: by 2002:a05:6e02:692:: with SMTP id o18mr1909426ils.145.1623815153170; Tue, 15 Jun 2021 20:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623815153; cv=none; d=google.com; s=arc-20160816; b=cpcXmb7cXLkxIqwe0NCNw29tab60b7zb36kMasTXOrkBCrTrDD0BrpnB7x4OvZnKJH IVgPWl4duBI7D+kvoI4w1RFbJGdCdYeNqay0UbnnIq0Wl67b8Fs4uOlnaWiMYqQlmqBH wY1cs0Co08FTBIjB+a0nu469kVuIxNzNDvBgBGPlL6WMF+ZH+dmjLCdO75srKgUC9dkX xNbp0rz5e5QokOPjF9M169ihqWfHplTNT/8yhpvkLhSB4+zMrR+lBTCXrPZaQjJNMmrG JM/+19YpRjhID0/VKGNLiWVSH3V1DB6m3IAsZ7kQ+xgKCQbfor8Z6Ppdo4aI8y6+yOgg YBTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=j+2zIE7dOVRQjqsiLAKdcWPyQsL7kyCmFeWYw+57LmQ=; b=Pul7NuKY+Q9LxKzxme8JXz2k9qjRsq+C7n77jedpyCR/qXraMIF8QdnelnLTndGt3m bSwsESpAIwK3+krpHdX7TcHmvmOQVxmwPXr5XvYQtU1oT8PakBX1+Du+c7XzbDfSOH2e wx41XrHVV8H/9vlpAXBC3XmRxZ8g0/OjZ6M4h6YF9pQtcpUI1hOKukudNQLVzDddY2aJ SuoFFDk6VvA1BF1NqOUX3JChQP94JfLHM+VjgonCdtBd9Je0Mr1zD3JRL1J5foqwbcC1 6F6rfzEI0eKSzSSxPYNaFLPjg4Nf1kd+PmAXZyOPw5HMfJy/D2xn7dRiaqKUGKcUFwVm 8Ggg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si1198777jak.97.2021.06.15.20.45.53 for ; Tue, 15 Jun 2021 20:45:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230330AbhFPDr5 (ORCPT ); Tue, 15 Jun 2021 23:47:57 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:4793 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbhFPDrz (ORCPT ); Tue, 15 Jun 2021 23:47:55 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4G4WDb75gTzXgPp; Wed, 16 Jun 2021 11:40:47 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:47 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:46 +0800 From: Zhen Lei To: Nilesh Javali , Manish Rangankar , Saurav Kashyap , Javed Hasan , Kashyap Desai , "Sumit Saxena" , Shivasharan S , GR-QLogic-Storage-Upstream , "megaraidlinux . pdl" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi CC: Zhen Lei Subject: [PATCH v2 3/4] scsi: megaraid_mbox: use DEVICE_ATTR_ADMIN_RO macro Date: Wed, 16 Jun 2021 11:44:18 +0800 Message-ID: <20210616034419.725-4-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210616034419.725-1-thunder.leizhen@huawei.com> References: <20210616034419.725-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use DEVICE_ATTR_ADMIN_RO macro helper instead of plain DEVICE_ATTR, which makes the code a bit shorter and easier to read. Signed-off-by: Zhen Lei --- drivers/scsi/megaraid/megaraid_mbox.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) -- 2.26.0.106.g9fadedd diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index d3fac99db786256..d20c2e4ee7934c9 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c @@ -121,8 +121,8 @@ static irqreturn_t megaraid_isr(int, void *); static void megaraid_mbox_dpc(unsigned long); -static ssize_t megaraid_sysfs_show_app_hndl(struct device *, struct device_attribute *attr, char *); -static ssize_t megaraid_sysfs_show_ldnum(struct device *, struct device_attribute *attr, char *); +static ssize_t megaraid_mbox_app_hndl_show(struct device *, struct device_attribute *attr, char *); +static ssize_t megaraid_mbox_ld_show(struct device *, struct device_attribute *attr, char *); static int megaraid_cmm_register(adapter_t *); static int megaraid_cmm_unregister(adapter_t *); @@ -302,8 +302,7 @@ static struct pci_driver megaraid_pci_driver = { // definitions for the device attributes for exporting logical drive number // for a scsi address (Host, Channel, Id, Lun) -static DEVICE_ATTR(megaraid_mbox_app_hndl, S_IRUSR, megaraid_sysfs_show_app_hndl, - NULL); +static DEVICE_ATTR_ADMIN_RO(megaraid_mbox_app_hndl); // Host template initializer for megaraid mbox sysfs device attributes static struct device_attribute *megaraid_shost_attrs[] = { @@ -312,7 +311,7 @@ static struct device_attribute *megaraid_shost_attrs[] = { }; -static DEVICE_ATTR(megaraid_mbox_ld, S_IRUSR, megaraid_sysfs_show_ldnum, NULL); +static DEVICE_ATTR_ADMIN_RO(megaraid_mbox_ld); // Host template initializer for megaraid mbox sysfs device attributes static struct device_attribute *megaraid_sdev_attrs[] = { @@ -3961,7 +3960,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter) /** - * megaraid_sysfs_show_app_hndl - display application handle for this adapter + * megaraid_mbox_app_hndl_show - display application handle for this adapter * @dev : class device object representation for the host * @attr : device attribute (unused) * @buf : buffer to send data to @@ -3971,8 +3970,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter) * handle, since we do not interface with applications directly. */ static ssize_t -megaraid_sysfs_show_app_hndl(struct device *dev, struct device_attribute *attr, - char *buf) +megaraid_mbox_app_hndl_show(struct device *dev, struct device_attribute *attr, char *buf) { struct Scsi_Host *shost = class_to_shost(dev); adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(shost); @@ -3985,7 +3983,7 @@ megaraid_sysfs_show_app_hndl(struct device *dev, struct device_attribute *attr, /** - * megaraid_sysfs_show_ldnum - display the logical drive number for this device + * megaraid_mbox_ld_show - display the logical drive number for this device * @dev : device object representation for the scsi device * @attr : device attribute to show * @buf : buffer to send data to @@ -4000,7 +3998,7 @@ megaraid_sysfs_show_app_hndl(struct device *dev, struct device_attribute *attr, * */ static ssize_t -megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, char *buf) +megaraid_mbox_ld_show(struct device *dev, struct device_attribute *attr, char *buf) { struct scsi_device *sdev = to_scsi_device(dev); adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host); From patchwork Wed Jun 16 03:44:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 461341 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp196425jae; Tue, 15 Jun 2021 20:45:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9dq8GWWEhGS+nwPPPCO5uTotCG81tuHmWPimczTMLNLy0ny7R+krgyfAPRIll+BUiZtux X-Received: by 2002:a92:750c:: with SMTP id q12mr1964484ilc.303.1623815150171; Tue, 15 Jun 2021 20:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623815150; cv=none; d=google.com; s=arc-20160816; b=tadDRL7+Qh0O9BBzlqOCEFOGqDdyF3jrVoiLZQeSTndy/9t1mdvpB+NsqkfX7lWhcP iecbi8BYkCHiSJ5IYxwWNlT79z32n12GZMHsaTNrr85v8eRZKP8qnAEf8iE9ikL8Kxzi Ok8G+12yUBbv2sBXbp8Aspd1BZeweFwqolSNMtodDzNjoPdh2ly45AmLb/LIpsHWAELa RIL6TWQecwXSL72uebOVSH92yvlxfHaJOfLW8j9Yqp4Y1ElzzLUXGdUOl2ARPa5BQplS 8zDfUjIO766/S16VHkx3XkIjCcIzfT/PgUvw4a8zdvaiZ1ueke/ZfkTlkSEkQQS7EOEc qZsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=KWKqcrShtdAe8/XNiXmKlSsloRu0iwEkMNh9AqD/HU0=; b=MMfY5VClFEOiobJG9JjV5zuo43xb8Nzv1+PZDbOthJKu+OAxIX7aP32CjAXWQ5EeLo cOc/rZJ2XMsKInpGUztJwPqUU3PmgKkRQSyKdhiogmjoeffpsEVcK7pZpu/M4QpOnal8 gHeR8nmhJq4gMv5J0XVfNStpSP7GO60IukThzJ34qVJ2aj5YP4NIAiwntFUe98cjx5bL B0muZ4AY89z1g8nr79XnZv4M00izHDdZm7zryQytPmA+RAaV6eLnm4MWqKrAMm1ABF2n IZmFPTEw1oAjPVZOc+Vbm77wj5kwGerv17vL4Lh5cnVaUXtcD4Z3FEuwe8UihWN77QJA hGsA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si1198777jak.97.2021.06.15.20.45.50 for ; Tue, 15 Jun 2021 20:45:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230490AbhFPDry (ORCPT ); Tue, 15 Jun 2021 23:47:54 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:7448 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230217AbhFPDry (ORCPT ); Tue, 15 Jun 2021 23:47:54 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4G4WH06GzRzZhm6; Wed, 16 Jun 2021 11:42:52 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:48 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 16 Jun 2021 11:45:47 +0800 From: Zhen Lei To: Nilesh Javali , Manish Rangankar , Saurav Kashyap , Javed Hasan , Kashyap Desai , "Sumit Saxena" , Shivasharan S , GR-QLogic-Storage-Upstream , "megaraidlinux . pdl" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi CC: Zhen Lei Subject: [PATCH v2 4/4] scsi: mvsas: use DEVICE_ATTR_RO/RW macro Date: Wed, 16 Jun 2021 11:44:19 +0800 Message-ID: <20210616034419.725-5-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210616034419.725-1-thunder.leizhen@huawei.com> References: <20210616034419.725-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use DEVICE_ATTR_RO/RW macro helper instead of plain DEVICE_ATTR, which makes the code a bit shorter and easier to read. Signed-off-by: Zhen Lei --- drivers/scsi/mvsas/mv_init.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) -- 2.26.0.106.g9fadedd diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index 6aa2697c4a15d24..53137f7d0e993da 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -692,22 +692,17 @@ static struct pci_driver mvs_pci_driver = { .remove = mvs_pci_remove, }; -static ssize_t -mvs_show_driver_version(struct device *cdev, - struct device_attribute *attr, char *buffer) +static ssize_t driver_version_show(struct device *cdev, + struct device_attribute *attr, char *buffer) { return snprintf(buffer, PAGE_SIZE, "%s\n", DRV_VERSION); } -static DEVICE_ATTR(driver_version, - S_IRUGO, - mvs_show_driver_version, - NULL); +static DEVICE_ATTR_RO(driver_version); -static ssize_t -mvs_store_interrupt_coalescing(struct device *cdev, - struct device_attribute *attr, - const char *buffer, size_t size) +static ssize_t interrupt_coalescing_store(struct device *cdev, + struct device_attribute *attr, + const char *buffer, size_t size) { unsigned int val = 0; struct mvs_info *mvi = NULL; @@ -745,16 +740,13 @@ mvs_store_interrupt_coalescing(struct device *cdev, return strlen(buffer); } -static ssize_t mvs_show_interrupt_coalescing(struct device *cdev, - struct device_attribute *attr, char *buffer) +static ssize_t interrupt_coalescing_show(struct device *cdev, + struct device_attribute *attr, char *buffer) { return snprintf(buffer, PAGE_SIZE, "%d\n", interrupt_coalescing); } -static DEVICE_ATTR(interrupt_coalescing, - S_IRUGO|S_IWUSR, - mvs_show_interrupt_coalescing, - mvs_store_interrupt_coalescing); +static DEVICE_ATTR_RW(interrupt_coalescing); static int __init mvs_init(void) {