tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[libata sata_promise] irq_pio: fix merge bug
+7
-9
+7
-9
drivers/scsi/sata_promise.c
+7
-9
drivers/scsi/sata_promise.c
···
70
70
PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */
71
71
72
72
PDC_RESET = (1 << 11), /* HDMA reset */
73
+
74
+
PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |
75
+
ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |
76
+
ATA_FLAG_PIO_POLLING,
73
77
};
74
78
75
79
···
166
162
/* board_2037x */
167
163
{
168
164
.sht = &pdc_ata_sht,
169
-
.host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
170
-
ATA_FLAG_SRST | ATA_FLAG_MMIO |
171
-
ATA_FLAG_PIO_POLLING,
165
+
.host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
172
166
.pio_mask = 0x1f, /* pio0-4 */
173
167
.mwdma_mask = 0x07, /* mwdma0-2 */
174
168
.udma_mask = 0x7f, /* udma0-6 ; FIXME */
···
176
174
/* board_20319 */
177
175
{
178
176
.sht = &pdc_ata_sht,
179
-
.host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
180
-
ATA_FLAG_SRST | ATA_FLAG_MMIO |
181
-
ATA_FLAG_PIO_POLLING,
177
+
.host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
182
178
.pio_mask = 0x1f, /* pio0-4 */
183
179
.mwdma_mask = 0x07, /* mwdma0-2 */
184
180
.udma_mask = 0x7f, /* udma0-6 ; FIXME */
···
186
186
/* board_20619 */
187
187
{
188
188
.sht = &pdc_ata_sht,
189
-
.host_flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |
190
-
ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS |
191
-
ATA_FLAG_PIO_POLLING,
189
+
.host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS,
192
190
.pio_mask = 0x1f, /* pio0-4 */
193
191
.mwdma_mask = 0x07, /* mwdma0-2 */
194
192
.udma_mask = 0x7f, /* udma0-6 ; FIXME */