linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
	linux-ide@vger.kernel.org
Subject: [PATCH 05/11] ata: sata_nv: Do not over-write initialise fields in 'nv_adma_sht' and 'nv_swncq_sht'
Date: Fri, 28 May 2021 10:04:56 +0100	[thread overview]
Message-ID: <20210528090502.1799866-6-lee.jones@linaro.org> (raw)
In-Reply-To: <20210528090502.1799866-1-lee.jones@linaro.org>

Fixes the following W=1 kernel build warning(s):

 drivers/ata/sata_nv.c:379:16: warning: initialized field overwritten [-Woverride-init]
 drivers/ata/sata_nv.c:379:16: note: (near initialization for ‘nv_adma_sht.can_queue’)
 drivers/ata/sata_nv.c:382:21: warning: initialized field overwritten [-Woverride-init]
 drivers/ata/sata_nv.c:382:21: note: (near initialization for ‘nv_adma_sht.slave_configure’)
 drivers/ata/sata_nv.c:387:16: warning: initialized field overwritten [-Woverride-init]
 drivers/ata/sata_nv.c:387:16: note: (near initialization for ‘nv_swncq_sht.can_queue’)
 drivers/ata/sata_nv.c:390:21: warning: initialized field overwritten [-Woverride-init]
 drivers/ata/sata_nv.c:390:21: note: (near initialization for ‘nv_swncq_sht.slave_configure’)

Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-ide@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/sata_nv.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index de45045566692..c385d18ce87b7 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -375,19 +375,25 @@ static struct scsi_host_template nv_sht = {
 };
 
 static struct scsi_host_template nv_adma_sht = {
-	ATA_NCQ_SHT(DRV_NAME),
+	__ATA_BASE_SHT(DRV_NAME),
 	.can_queue		= NV_ADMA_MAX_CPBS,
 	.sg_tablesize		= NV_ADMA_SGTBL_TOTAL_LEN,
 	.dma_boundary		= NV_ADMA_DMA_BOUNDARY,
 	.slave_configure	= nv_adma_slave_config,
+	.sdev_attrs             = ata_ncq_sdev_attrs,
+	.change_queue_depth     = ata_scsi_change_queue_depth,
+	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,
 };
 
 static struct scsi_host_template nv_swncq_sht = {
-	ATA_NCQ_SHT(DRV_NAME),
+	__ATA_BASE_SHT(DRV_NAME),
 	.can_queue		= ATA_MAX_QUEUE - 1,
 	.sg_tablesize		= LIBATA_MAX_PRD,
 	.dma_boundary		= ATA_DMA_BOUNDARY,
 	.slave_configure	= nv_swncq_slave_config,
+	.sdev_attrs             = ata_ncq_sdev_attrs,
+	.change_queue_depth     = ata_scsi_change_queue_depth,
+	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,
 };
 
 /*
-- 
2.31.1


  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 ` [PATCH 01/11] ata: include: libata: Move fields commonly over-written to separate MACRO Lee Jones
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 ` Lee Jones [this message]
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-6-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 \
    --subject='Re: [PATCH 05/11] ata: sata_nv: Do not over-write initialise fields in '\''nv_adma_sht'\'' and '\''nv_swncq_sht'\''' \
    /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

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).