Merge tag 'ata-5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

Pull ATA fix from Damien Le Moal: - Fix a compilation warning with some versions of gcc/sparse when compiling the pata_cs5535 driver, from John. * tag 'ata-5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: ata: pata_cs5535: Fix W=1 warnings

Linus Torvalds committed 4 years ago

Commit 690685f2 parents 9650910 32788be1 file · +2 −2Browse files

Unified · Split

drivers/ata/pata_cs5535.c+2−2

@@ -90,7 +90,7 @@ static void cs5535_set_piomode(struct ata_port ap, struct ata_device adev) · 89 unmodified lines
90	static const u16 pio_cmd_timings[5] = {	90	static const u16 pio_cmd_timings[5] = {
91	0xF7F4, 0x53F3, 0x13F1, 0x5131, 0x1131	91	0xF7F4, 0x53F3, 0x13F1, 0x5131, 0x1131
92	};	92	};
93	u32 reg, dummy;	93	u32 reg, __maybe_unused dummy;
94	struct ata_device *pair = ata_dev_pair(adev);	94	struct ata_device *pair = ata_dev_pair(adev);
95		95
96	int mode = adev->pio_mode - XFER_PIO_0;	96	int mode = adev->pio_mode - XFER_PIO_0;
@@ -129,7 +129,7 @@ static void cs5535_set_dmamode(struct ata_port ap, struct ata_device adev) · 32 unmodified lines
129	static const u32 mwdma_timings[3] = {	129	static const u32 mwdma_timings[3] = {
130	0x7F0FFFF3, 0x7F035352, 0x7F024241	130	0x7F0FFFF3, 0x7F035352, 0x7F024241
131	};	131	};
132	u32 reg, dummy;	132	u32 reg, __maybe_unused dummy;
133	int mode = adev->dma_mode;	133	int mode = adev->dma_mode;
134		134
135	rdmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg, dummy);	135	rdmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg, dummy);