IDE fixes
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
drivers/ide/falconide.c | 2 +- drivers/ide/ide-probe.c | 3 ++- drivers/ide/palm_bk3710.c | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-)
Andreas Schwab (1):
ide: fix IDE PMAC breakage
David Brownell (1):
drivers/ide/palm_bk3710.c buildfix
Michael Schmitz (1):
ide: fix Falcon IDE breakage
drivers/ide/falconide.c +1 -1
@@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = {static const struct ide_port_info falconide_port_info = { .tp_ops = &falconide_tp_ops, - .host_flags =IDE_HFLAG_NO_DMA , + .host_flags =IDE_HFLAG_NO_DMA |IDE_HFLAG_SERIALIZE , };static void __init falconide_setup_ports (hw_regs_t *hw)
drivers/ide/ide-probe.c +2 -1
@@ -649,7 +649,8 @@ static int ide_register_port(ide_hwif_t *hwif)/* register with global device tree */ dev_set_name (&hwif->gendev, hwif->name); hwif->gendev.driver_data = hwif; - hwif->gendev.parent = hwif->dev; +if (hwif->gendev.parent ==NULL ) + hwif->gendev.parent = hwif->dev; hwif->gendev.release = hwif_release_dev; ret =device_register (&hwif->gendev);
drivers/ide/palm_bk3710.c +7 -4
@@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) {struct clk *clk;struct resource *mem, *irq; -unsigned long base, rate; +void __iomem *base; +unsigned long rate;int i, rc;hw_regs_t hw, *hws[] = { &hw,NULL ,NULL ,NULL };
@@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) base =IO_ADDRESS (mem->start);/* Configure the Palm Chip controller */ -palm_bk3710_chipinit ((void __iomem *)base); +palm_bk3710_chipinit (base);for (i =0 ; i <IDE_NR_PORTS -2 ; i++) - hw.io_ports_array[i] = base +IDE_PALM_ATA_PRI_REG_OFFSET + i; - hw.io_ports.ctl_addr = base +IDE_PALM_ATA_PRI_CTL_OFFSET ; + hw.io_ports_array[i] = (unsigned long ) + (base +IDE_PALM_ATA_PRI_REG_OFFSET + i); + hw.io_ports.ctl_addr = (unsigned long ) + (base +IDE_PALM_ATA_PRI_CTL_OFFSET ); hw.irq = irq->start; hw.dev = &pdev->dev; hw.chipset = ide_palm3710;