From patchwork Wed Jul 1 03:47:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Seymour, Shane M" X-Patchwork-Id: 6699761 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 372E1C05AC for ; Wed, 1 Jul 2015 03:49:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 684CE20664 for ; Wed, 1 Jul 2015 03:49:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3376120660 for ; Wed, 1 Jul 2015 03:49:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751772AbbGADtQ (ORCPT ); Tue, 30 Jun 2015 23:49:16 -0400 Received: from g9t5009.houston.hp.com ([15.240.92.67]:35703 "EHLO g9t5009.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbbGADtO convert rfc822-to-8bit (ORCPT ); Tue, 30 Jun 2015 23:49:14 -0400 Received: from G9W0364.americas.hpqcorp.net (g9w0364.houston.hp.com [16.216.193.45]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by g9t5009.houston.hp.com (Postfix) with ESMTPS id C6CC63AA; Wed, 1 Jul 2015 03:49:13 +0000 (UTC) Received: from G4W6303.americas.hpqcorp.net (16.210.26.228) by G9W0364.americas.hpqcorp.net (16.216.193.45) with Microsoft SMTP Server (TLS) id 14.3.169.1; Wed, 1 Jul 2015 03:47:11 +0000 Received: from G9W0766.americas.hpqcorp.net ([169.254.4.103]) by G4W6303.americas.hpqcorp.net ([16.210.26.228]) with mapi id 14.03.0169.001; Wed, 1 Jul 2015 03:47:11 +0000 From: "Seymour, Shane M" To: "linux-scsi@vger.kernel.org" , "James Bottomley (JBottomley@Odin.com)" , ISS StorageDev CC: "linux-api@vger.kernel.org" , "Greg KH (greg@kroah.com)" Subject: [PATCH 3/3] hpsa: Convert DEVICE_ATTR macro usage to DEVICE_ATTR_RO|WR|WO Thread-Topic: [PATCH 3/3] hpsa: Convert DEVICE_ATTR macro usage to DEVICE_ATTR_RO|WR|WO Thread-Index: AdCzrnNsqnIyO40PTyOmz78eCckhxA== Date: Wed, 1 Jul 2015 03:47:10 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [16.210.48.15] MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert DEVICE_ATTR macro usage to DEVICE_ATTR_RO|WR|WO Changes forced some function names to change. Signed-off-by: Shane Seymour Acked-by: Greg Kroah-Hartman Signed-off-by: Don Brace --- -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/scsi/hpsa.c 2015-06-30 16:34:01.403904650 -0500 +++ b/drivers/scsi/hpsa.c 2015-06-30 16:21:54.214954176 -0500 @@ -376,7 +376,7 @@ static int check_for_busy(struct ctlr_in } static u32 lockup_detected(struct ctlr_info *h); -static ssize_t host_show_lockup_detected(struct device *dev, +static ssize_t lockup_detected_show(struct device *dev, struct device_attribute *attr, char *buf) { int ld; @@ -389,7 +389,7 @@ static ssize_t host_show_lockup_detected return sprintf(buf, "ld=%d\n", ld); } -static ssize_t host_store_hp_ssd_smart_path_status(struct device *dev, +static ssize_t hp_ssd_smart_path_status_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { @@ -413,7 +413,7 @@ static ssize_t host_store_hp_ssd_smart_p return count; } -static ssize_t host_store_raid_offload_debug(struct device *dev, +static ssize_t raid_offload_debug_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { @@ -438,7 +438,7 @@ static ssize_t host_store_raid_offload_d return count; } -static ssize_t host_store_rescan(struct device *dev, +static ssize_t rescan_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { @@ -449,7 +449,7 @@ static ssize_t host_store_rescan(struct return count; } -static ssize_t host_show_firmware_revision(struct device *dev, +static ssize_t firmware_revision_show(struct device *dev, struct device_attribute *attr, char *buf) { struct ctlr_info *h; @@ -464,7 +464,7 @@ static ssize_t host_show_firmware_revisi fwrev[0], fwrev[1], fwrev[2], fwrev[3]); } -static ssize_t host_show_commands_outstanding(struct device *dev, +static ssize_t commands_outstanding_show(struct device *dev, struct device_attribute *attr, char *buf) { struct Scsi_Host *shost = class_to_shost(dev); @@ -474,7 +474,7 @@ static ssize_t host_show_commands_outsta atomic_read(&h->commands_outstanding)); } -static ssize_t host_show_transport_mode(struct device *dev, +static ssize_t transport_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { struct ctlr_info *h; @@ -486,7 +486,7 @@ static ssize_t host_show_transport_mode( "performant" : "simple"); } -static ssize_t host_show_hp_ssd_smart_path_status(struct device *dev, +static ssize_t hp_ssd_smart_path_status_show(struct device *dev, struct device_attribute *attr, char *buf) { struct ctlr_info *h; @@ -582,7 +582,7 @@ static int ctlr_needs_abort_tags_swizzle ARRAY_SIZE(needs_abort_tags_swizzled), board_id); } -static ssize_t host_show_resettable(struct device *dev, +static ssize_t resettable_show(struct device *dev, struct device_attribute *attr, char *buf) { struct ctlr_info *h; @@ -692,7 +692,7 @@ static ssize_t unique_id_show(struct dev sn[12], sn[13], sn[14], sn[15]); } -static ssize_t host_show_hp_ssd_smart_path_enabled(struct device *dev, +static ssize_t hp_ssd_smart_path_enabled_show(struct device *dev, struct device_attribute *attr, char *buf) { struct ctlr_info *h; @@ -714,27 +714,18 @@ static ssize_t host_show_hp_ssd_smart_pa return scnprintf(buf, 20, "%d\n", offload_enabled); } -static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL); -static DEVICE_ATTR(lunid, S_IRUGO, lunid_show, NULL); -static DEVICE_ATTR(unique_id, S_IRUGO, unique_id_show, NULL); -static DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan); -static DEVICE_ATTR(hp_ssd_smart_path_enabled, S_IRUGO, - host_show_hp_ssd_smart_path_enabled, NULL); -static DEVICE_ATTR(hp_ssd_smart_path_status, S_IWUSR|S_IRUGO|S_IROTH, - host_show_hp_ssd_smart_path_status, - host_store_hp_ssd_smart_path_status); -static DEVICE_ATTR(raid_offload_debug, S_IWUSR, NULL, - host_store_raid_offload_debug); -static DEVICE_ATTR(firmware_revision, S_IRUGO, - host_show_firmware_revision, NULL); -static DEVICE_ATTR(commands_outstanding, S_IRUGO, - host_show_commands_outstanding, NULL); -static DEVICE_ATTR(transport_mode, S_IRUGO, - host_show_transport_mode, NULL); -static DEVICE_ATTR(resettable, S_IRUGO, - host_show_resettable, NULL); -static DEVICE_ATTR(lockup_detected, S_IRUGO, - host_show_lockup_detected, NULL); +static DEVICE_ATTR_RO(raid_level); +static DEVICE_ATTR_RO(lunid); +static DEVICE_ATTR_RO(unique_id); +static DEVICE_ATTR_WO(rescan); +static DEVICE_ATTR_RO(hp_ssd_smart_path_enabled); +static DEVICE_ATTR_RW(hp_ssd_smart_path_status); +static DEVICE_ATTR_WO(raid_offload_debug); +static DEVICE_ATTR_RO(firmware_revision); +static DEVICE_ATTR_RO(commands_outstanding); +static DEVICE_ATTR_RO(transport_mode); +static DEVICE_ATTR_RO(resettable); +static DEVICE_ATTR_RO(lockup_detected); static struct device_attribute *hpsa_sdev_attrs[] = { &dev_attr_raid_level,