Commit 7d43b828 authored by Lee Jones's avatar Lee Jones Committed by Jens Axboe
Browse files

ata: sata_nv: Do not over-write initialise fields in 'nv_adma_sht' and 'nv_swncq_sht' 



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: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20210528090502.1799866-6-lee.jones@linaro.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e75f41a9

drivers/ata/sata_nv.c

+8 −2
Original line number Diff line number Diff line
@@ -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,

};



/*