Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE fixes from David S. Miller:
1) Two fixes to icside, one for a build failure and another for a
warning. From Christian Dietrich.
2) Fix a bit operation that did erroneous masking, from Julia Lawall.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
drivers/ide/ide-cs.c: adjust suspicious bit operation
ide: icside.c: fix printk format string compile warning
ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n
+10
-10
+8
-9
drivers/ide/icside.c
+8
-9
drivers/ide/icside.c
···
236
236
*/
237
237
static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
238
238
{
239
-
unsigned long cycle_time;
239
+
unsigned long cycle_time = 0;
240
240
int use_dma_info = 0;
241
241
const u8 xfer_mode = drive->dma_mode;
242
242
···
271
271
272
272
ide_set_drivedata(drive, (void *)cycle_time);
273
273
274
-
printk("%s: %s selected (peak %dMB/s)\n", drive->name,
275
-
ide_xfer_verbose(xfer_mode),
276
-
2000 / (unsigned long)ide_get_drivedata(drive));
274
+
printk(KERN_INFO "%s: %s selected (peak %luMB/s)\n",
275
+
drive->name, ide_xfer_verbose(xfer_mode),
276
+
2000 / (cycle_time ? cycle_time : (unsigned long) -1));
277
277
}
278
278
279
279
static const struct ide_port_ops icside_v6_port_ops = {
···
375
375
.dma_test_irq = icside_dma_test_irq,
376
376
.dma_lost_irq = ide_dma_lost_irq,
377
377
};
378
-
#else
379
-
#define icside_v6_dma_ops NULL
380
378
#endif
381
379
382
380
static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
···
454
456
static const struct ide_port_info icside_v6_port_info __initdata = {
455
457
.init_dma = icside_dma_off_init,
456
458
.port_ops = &icside_v6_no_dma_port_ops,
457
-
.dma_ops = &icside_v6_dma_ops,
458
459
.host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,
459
460
.mwdma_mask = ATA_MWDMA2,
460
461
.swdma_mask = ATA_SWDMA2,
···
515
518
516
519
ecard_set_drvdata(ec, state);
517
520
521
+
#ifdef CONFIG_BLK_DEV_IDEDMA_ICS
518
522
if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
519
523
d.init_dma = icside_dma_init;
520
524
d.port_ops = &icside_v6_port_ops;
521
-
} else
522
-
d.dma_ops = NULL;
525
+
d.dma_ops = &icside_v6_dma_ops;
526
+
}
527
+
#endif
523
528
524
529
ret = ide_host_register(host, &d, hws);
525
530
if (ret)
+2
-1
drivers/ide/ide-cs.c
+2
-1
drivers/ide/ide-cs.c
···
167
167
{
168
168
int *is_kme = priv_data;
169
169
170
-
if (!(pdev->resource[0]->flags & IO_DATA_PATH_WIDTH_8)) {
170
+
if ((pdev->resource[0]->flags & IO_DATA_PATH_WIDTH)
171
+
!= IO_DATA_PATH_WIDTH_8) {
171
172
pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
172
173
pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
173
174
}