ata: pata_macio: Avoid overwriting initialised field in 'pata_macio_sht'
authorLee Jones <lee.jones@linaro.org>
Fri, 28 May 2021 09:05:02 +0000 (10:05 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 16 Jun 2021 12:50:26 +0000 (06:50 -0600)
Fixes the following W=1 kernel build warning(s):

 drivers/ata/pata_macio.c:925:21: warning: initialized field overwritten [-Woverride-init]
 drivers/ata/pata_macio.c:925:21: note: (near initialization for ‘pata_macio_sht.slave_configure’)

Cc: Jens Axboe <axboe@kernel.dk>
Cc: benh@kernel.crashing.org
Cc: linux-ide@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20210528090502.1799866-12-lee.jones@linaro.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/ata/pata_macio.c

index e47a28271f5bb46334d043e8bb69ab2cf8f8230d..be0ca8d5b3452e0a24325d3a98d75ca75ad2eb99 100644 (file)
@@ -914,7 +914,7 @@ static int pata_macio_do_resume(struct pata_macio_priv *priv)
 #endif /* CONFIG_PM_SLEEP */
 
 static struct scsi_host_template pata_macio_sht = {
-       ATA_BASE_SHT(DRV_NAME),
+       __ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = MAX_DCMDS,
        /* We may not need that strict one */
        .dma_boundary           = ATA_DMA_BOUNDARY,
@@ -923,6 +923,9 @@ static struct scsi_host_template pata_macio_sht = {
         */
        .max_segment_size       = MAX_DBDMA_SEG,
        .slave_configure        = pata_macio_slave_config,
+       .sdev_attrs             = ata_common_sdev_attrs,
+       .can_queue              = ATA_DEF_QUEUE,
+       .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 };
 
 static struct ata_port_operations pata_macio_ops = {