Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

-7

MAINTAINERS

··· 3658 3658 L: netdev@vger.kernel.org 3659 3659 S: Maintained 3660 3660 3661 - SIS 5513 IDE CONTROLLER DRIVER 3662 - P: Lionel Bouton 3663 - M: Lionel.Bouton@inet6.fr 3664 - W: http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html 3665 - W: http://gyver.homeip.net/sis5513/index.html 3666 - S: Maintained 3667 - 3668 3661 SIS 900/7016 FAST ETHERNET DRIVER 3669 3662 P: Daniele Venzano 3670 3663 M: venza@brownhat.org

+1

drivers/ide/Kconfig

··· 1028 1028 1029 1029 config BLK_DEV_HD_ONLY 1030 1030 bool "Old hard disk (MFM/RLL/IDE) driver" 1031 + depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN 1031 1032 help 1032 1033 There are two drivers for MFM/RLL/IDE hard disks. Most people use 1033 1034 the newer enhanced driver, but this old one is still around for two

+1

drivers/ide/arm/bast-ide.c

··· 42 42 43 43 hw.io_ports.ctl_addr = aux + (6 * 0x20); 44 44 hw.irq = irq; 45 + hw.chipset = ide_generic; 45 46 46 47 hwif = ide_find_port(); 47 48 if (hwif == NULL)

+1

drivers/ide/arm/ide_arm.c

··· 49 49 memset(&hw, 0, sizeof(hw)); 50 50 ide_std_init_ports(&hw, base, ctl); 51 51 hw.irq = IDE_ARM_IRQ; 52 + hw.chipset = ide_generic; 52 53 53 54 hwif = ide_find_port(); 54 55 if (hwif) {

-3

drivers/ide/arm/palm_bk3710.c

··· 409 409 410 410 ide_device_add(idx, &palm_bk3710_port_info); 411 411 412 - if (!hwif->present) 413 - goto out; 414 - 415 412 return 0; 416 413 out: 417 414 printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n");

+1

drivers/ide/ide-generic.c

··· 125 125 memset(&hw, 0, sizeof(hw)); 126 126 ide_std_init_ports(&hw, io_addr, io_addr + 0x206); 127 127 hw.irq = ide_default_irq(io_addr); 128 + hw.chipset = ide_generic; 128 129 ide_init_port_hw(hwif, &hw); 129 130 130 131 idx[i] = i;

+1

drivers/ide/ide-pnp.c

··· 55 55 memset(&hw, 0, sizeof(hw)); 56 56 ide_std_init_ports(&hw, base, ctl); 57 57 hw.irq = pnp_irq(dev, 0); 58 + hw.chipset = ide_generic; 58 59 59 60 hwif = ide_find_port(); 60 61 if (hwif) {

+3 -3

drivers/ide/ide-probe.c

··· 1333 1333 static void ide_init_port(ide_hwif_t *hwif, unsigned int port, 1334 1334 const struct ide_port_info *d) 1335 1335 { 1336 - if (d->chipset != ide_etrax100) 1337 - hwif->channel = port; 1336 + hwif->channel = port; 1338 1337 1339 1338 if (d->chipset) 1340 1339 hwif->chipset = d->chipset; ··· 1518 1519 continue; 1519 1520 } 1520 1521 1521 - if (d->chipset != ide_etrax100 && (i & 1) && mate) { 1522 + if ((i & 1) && mate) { 1522 1523 hwif->mate = mate; 1523 1524 mate->mate = hwif; 1524 1525 } ··· 1664 1665 1665 1666 ide_std_init_ports(hw, base, ctl); 1666 1667 hw->irq = irq; 1668 + hw->chipset = d->chipset; 1667 1669 1668 1670 hwif = ide_find_port_slot(d); 1669 1671 if (hwif) {

-1

drivers/ide/ide-proc.c

··· 63 63 case ide_pmac: name = "mac-io"; break; 64 64 case ide_au1xxx: name = "au1xxx"; break; 65 65 case ide_palm3710: name = "palm3710"; break; 66 - case ide_etrax100: name = "etrax100"; break; 67 66 case ide_acorn: name = "acorn"; break; 68 67 default: name = "(unknown)"; break; 69 68 }

+2

drivers/ide/legacy/buddha.c

··· 138 138 139 139 hw->irq = IRQ_AMIGA_PORTS; 140 140 hw->ack_intr = ack_intr; 141 + 142 + hw->chipset = ide_generic; 141 143 } 142 144 143 145 /*

+2

drivers/ide/legacy/falconide.c

··· 81 81 82 82 hw->irq = IRQ_MFP_IDE; 83 83 hw->ack_intr = NULL; 84 + 85 + hw->chipset = ide_generic; 84 86 } 85 87 86 88 /*

+6

drivers/ide/legacy/gayle.c

··· 16 16 #include <linux/ide.h> 17 17 #include <linux/init.h> 18 18 #include <linux/zorro.h> 19 + #include <linux/module.h> 19 20 20 21 #include <asm/setup.h> 21 22 #include <asm/amigahw.h> ··· 63 62 GAYLE_NUM_HWIFS-1) 64 63 #define GAYLE_HAS_CONTROL_REG (!ide_doubler) 65 64 #define GAYLE_IDEREG_SIZE (ide_doubler ? 0x1000 : 0x2000) 65 + 66 66 int ide_doubler = 0; /* support IDE doublers? */ 67 + EXPORT_SYMBOL_GPL(ide_doubler); 68 + 67 69 module_param_named(doubler, ide_doubler, bool, 0); 68 70 MODULE_PARM_DESC(doubler, "enable support for IDE doublers"); 69 71 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */ ··· 116 112 117 113 hw->irq = IRQ_AMIGA_PORTS; 118 114 hw->ack_intr = ack_intr; 115 + 116 + hw->chipset = ide_generic; 119 117 } 120 118 121 119 /*

+2

drivers/ide/legacy/macide.c

··· 78 78 79 79 hw->irq = irq; 80 80 hw->ack_intr = ack_intr; 81 + 82 + hw->chipset = ide_generic; 81 83 } 82 84 83 85 static const char *mac_ide_name[] =

+2

drivers/ide/legacy/q40ide.c

··· 70 70 71 71 hw->irq = irq; 72 72 hw->ack_intr = ack_intr; 73 + 74 + hw->chipset = ide_generic; 73 75 } 74 76 75 77 static void q40ide_input_data(ide_drive_t *drive, struct request *rq,

+2

drivers/ide/pci/cmd640.c

··· 747 747 748 748 ide_std_init_ports(&hw[0], 0x1f0, 0x3f6); 749 749 hw[0].irq = 14; 750 + hw[0].chipset = ide_cmd640; 750 751 751 752 ide_std_init_ports(&hw[1], 0x170, 0x376); 752 753 hw[1].irq = 15; 754 + hw[1].chipset = ide_cmd640; 753 755 754 756 printk(KERN_INFO "cmd640: buggy cmd640%c interface on %s, config=0x%02x" 755 757 "\n", 'a' + cmd640_chip_version - 1, bus_type, cfr);

+11 -17

drivers/ide/pci/delkin_cb.c

··· 47 47 .quirkproc = ide_undecoded_slave, 48 48 }; 49 49 50 + static const struct ide_port_info delkin_cb_port_info = { 51 + .port_ops = &delkin_cb_port_ops, 52 + .host_flags = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS | 53 + IDE_HFLAG_NO_DMA, 54 + }; 55 + 50 56 static int __devinit 51 57 delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) 52 58 { 53 59 unsigned long base; 54 60 hw_regs_t hw; 55 61 ide_hwif_t *hwif = NULL; 56 - ide_drive_t *drive; 57 62 int i, rc; 58 63 u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; 59 64 ··· 84 79 memset(&hw, 0, sizeof(hw)); 85 80 ide_std_init_ports(&hw, base + 0x10, base + 0x1e); 86 81 hw.irq = dev->irq; 82 + hw.dev = &dev->dev; 87 83 hw.chipset = ide_pci; /* this enables IRQ sharing */ 88 84 89 85 hwif = ide_find_port(); ··· 95 89 96 90 ide_init_port_data(hwif, i); 97 91 ide_init_port_hw(hwif, &hw); 98 - hwif->port_ops = &delkin_cb_port_ops; 99 92 100 93 idx[0] = i; 101 94 102 - ide_device_add(idx, NULL); 103 - 104 - if (!hwif->present) 105 - goto out_disable; 95 + ide_device_add(idx, &delkin_cb_port_info); 106 96 107 97 pci_set_drvdata(dev, hwif); 108 - hwif->dev = &dev->dev; 109 - drive = &hwif->drives[0]; 110 - if (drive->present) { 111 - drive->io_32bit = 1; 112 - drive->unmask = 1; 113 - } 98 + 114 99 return 0; 115 100 116 101 out_disable: 117 - printk(KERN_ERR "delkin_cb: no IDE devices found\n"); 118 102 pci_release_regions(dev); 119 103 pci_disable_device(dev); 120 104 return -ENODEV; ··· 135 139 .remove = delkin_cb_remove, 136 140 }; 137 141 138 - static int 139 - delkin_cb_init (void) 142 + static int __init delkin_cb_init(void) 140 143 { 141 144 return pci_register_driver(&driver); 142 145 } 143 146 144 - static void 145 - delkin_cb_exit (void) 147 + static void __exit delkin_cb_exit(void) 146 148 { 147 149 pci_unregister_driver(&driver); 148 150 }

+5

drivers/ide/pci/sis5513.c

··· 569 569 { 570 570 struct ide_port_info d = sis5513_chipset; 571 571 u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f }; 572 + int rc; 573 + 574 + rc = pci_enable_device(dev); 575 + if (rc) 576 + return rc; 572 577 573 578 if (sis_find_family(dev) == 0) 574 579 return -ENOTSUPP;

+4

drivers/ide/ppc/mpc8xx.c

··· 303 303 pcmp->pcmc_per = 0x100000 >> (16 * _slot_); 304 304 #endif /* CONFIG_IDE_8xx_PCCARD */ 305 305 306 + hw->chipset = ide_generic; 307 + 306 308 return 0; 307 309 } 308 310 #endif /* CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT */ ··· 378 376 /* (11-18) Set edge detect for irq, no wakeup from low power mode */ 379 377 ((immap_t *) IMAP_ADDR)->im_siu_conf.sc_siel |= 380 378 (0x80000000 >> ioport_dsc[data_port].irq); 379 + 380 + hw->chipset = ide_generic; 381 381 382 382 return 0; 383 383 }

+1 -1

include/linux/ide.h

··· 153 153 ide_qd65xx, ide_umc8672, ide_ht6560b, 154 154 ide_rz1000, ide_trm290, 155 155 ide_cmd646, ide_cy82c693, ide_4drives, 156 - ide_pmac, ide_etrax100, ide_acorn, 156 + ide_pmac, ide_acorn, 157 157 ide_au1xxx, ide_palm3710 158 158 }; 159 159

Configure Feed

Configure Feed