From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
Mark Lord <mlord@pobox.com>,
Philipp Zabel <p.zabel@pengutronix.de>, Tejun Heo <tj@kernel.org>,
linux-ide@vger.kernel.org
Subject: [PATCH 01/11] ata: include: libata: Move fields commonly over-written to separate MACRO
Date: Fri, 28 May 2021 10:04:52 +0100 [thread overview]
Message-ID: <20210528090502.1799866-2-lee.jones@linaro.org> (raw)
In-Reply-To: <20210528090502.1799866-1-lee.jones@linaro.org>
This is a pre-cursor to some upcoming W=1 fix-ups.
Fixes the following W=1 kernel build warning(s):
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Mark Lord <mlord@pobox.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
include/linux/libata.h | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 5f550eb27f811..3fcd24236793e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1397,25 +1397,28 @@ extern struct device_attribute *ata_common_sdev_attrs[];
ATA_SCSI_COMPAT_IOCTL \
.queuecommand = ata_scsi_queuecmd, \
.dma_need_drain = ata_scsi_dma_need_drain, \
- .can_queue = ATA_DEF_QUEUE, \
- .tag_alloc_policy = BLK_TAG_ALLOC_RR, \
.this_id = ATA_SHT_THIS_ID, \
.emulated = ATA_SHT_EMULATED, \
.proc_name = drv_name, \
- .slave_configure = ata_scsi_slave_config, \
.slave_destroy = ata_scsi_slave_destroy, \
.bios_param = ata_std_bios_param, \
.unlock_native_capacity = ata_scsi_unlock_native_capacity
-#define ATA_BASE_SHT(drv_name) \
+#define ATA_SUBBASE_SHT(drv_name) \
__ATA_BASE_SHT(drv_name), \
+ .can_queue = ATA_DEF_QUEUE, \
+ .tag_alloc_policy = BLK_TAG_ALLOC_RR, \
+ .slave_configure = ata_scsi_slave_config
+
+#define ATA_BASE_SHT(drv_name) \
+ ATA_SUBBASE_SHT(drv_name), \
.sdev_attrs = ata_common_sdev_attrs
#ifdef CONFIG_SATA_HOST
extern struct device_attribute *ata_ncq_sdev_attrs[];
#define ATA_NCQ_SHT(drv_name) \
- __ATA_BASE_SHT(drv_name), \
+ ATA_SUBBASE_SHT(drv_name), \
.sdev_attrs = ata_ncq_sdev_attrs, \
.change_queue_depth = ata_scsi_change_queue_depth
#endif
--
2.31.1
next prev parent reply other threads:[~2021-05-28 9:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 9:04 [PATCH 00/11] Rid W=1 warnings from ATA Lee Jones
2021-05-28 9:04 ` Lee Jones [this message]
2021-05-28 9:04 ` [PATCH 02/11] ata: ahci: Ensure initialised fields are not overwritten in AHCI_SHT() Lee Jones
2021-05-28 9:04 ` [PATCH 03/11] ata: sata_sil24: Do not over-write initialise fields in 'sil24_sht' Lee Jones
2021-05-28 9:04 ` [PATCH 04/11] ata: sata_mv: Do not over-write initialise fields in 'mv6_sht' Lee Jones
2021-05-28 9:04 ` [PATCH 05/11] ata: sata_nv: Do not over-write initialise fields in 'nv_adma_sht' and 'nv_swncq_sht' Lee Jones
2021-05-28 9:04 ` [PATCH 06/11] ata: pata_atiixp: Avoid overwriting initialised field in 'atiixp_sht' Lee Jones
2021-05-28 9:04 ` [PATCH 07/11] ata: pata_cs5520: Avoid overwriting initialised field in 'cs5520_sht' Lee Jones
2021-05-28 9:04 ` [PATCH 08/11] ata: pata_cs5530: Avoid overwriting initialised field in 'cs5530_sht' Lee Jones
2021-05-28 9:05 ` [PATCH 09/11] ata: pata_sc1200: sc1200_sht'Avoid overwriting initialised field in ' Lee Jones
2021-05-28 9:05 ` [PATCH 10/11] ata: pata_serverworks: Avoid overwriting initialised field in 'serverworks_osb4_sht Lee Jones
2021-05-28 9:05 ` [PATCH 11/11] ata: pata_macio: Avoid overwriting initialised field in 'pata_macio_sht' Lee Jones
2021-06-16 12:44 ` [PATCH 00/11] Rid W=1 warnings from ATA Lee Jones
2021-06-16 12:50 ` Jens Axboe
2021-06-17 9:49 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210528090502.1799866-2-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=axboe@kernel.dk \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mlord@pobox.com \
--cc=p.zabel@pengutronix.de \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).