Skip to contentSkip to conversation

IDE fixes

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Apr 2, 2008

Subsystems (2)
PowerPC libata
lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 IDE fixes

few obvious things (mainly Adrian's fixes for missing MODULE_LICENSE-s)

Linus, please pull from:

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

to receive the following updates:

 drivers/ide/arm/ide_arm.c      |    2 ++
 drivers/ide/cris/ide-cris.c    |    2 ++
 drivers/ide/h8300/ide-h8300.c  |    3 +++
 drivers/ide/ide-iops.c         |    2 +-
 drivers/ide/ide-pnp.c          |    2 ++
 drivers/ide/legacy/buddha.c    |    2 ++
 drivers/ide/legacy/falconide.c |    2 ++
 drivers/ide/legacy/gayle.c     |    2 ++
 drivers/ide/legacy/macide.c    |    2 ++
 drivers/ide/legacy/q40ide.c    |    2 ++
 drivers/ide/pci/cmd640.c       |    2 ++
 drivers/ide/ppc/mpc8xx.c       |    2 ++
 drivers/ide/ppc/pmac.c         |    2 ++
 13 files changed, 26 insertions(+), 1 deletions(-)

Adrian Bunk (12):
ide-pnp.c: add MODULE_LICENSE
ide/pci/cmd640.c: add MODULE_LICENSE
ide/ppc/mpc8xx.c: add MODULE_LICENSE
ide/ppc/pmac.c: add MODULE_LICENSE
ide/arm/ide_arm.c: add MODULE_LICENSE
ide/cris/ide-cris.c: add MODULE_LICENSE
ide/h8300/ide-h8300.c: add MODULE_LICENSE
ide/legacy/gayle.c: add MODULE_LICENSE
ide/legacy/buddha.c: add MODULE_LICENSE
ide/legacy/falconide.c: add MODULE_LICENSE
ide/legacy/macide: add MODULE_LICENSE
ide/legacy/q40ide.c: add MODULE_LICENSE

Bartlomiej Zolnierkiewicz (2):

      ide-h8300: 32-bit I/O is unsupported
      ide: use ->ata_input_data in ide_driveid_update()
drivers/ide/arm/ide_arm.c +2 -0
index 43a70e9..be9ff73 100644
@@ -46,3 +46,5 @@ static int __init ide_arm_init(void)
 }
 
 module_init(ide_arm_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/cris/ide-cris.c +2 -0
index e79bf8f..c8ffbaf 100644
@@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive)
 }
 
 module_init(init_e100_ide);
+
+MODULE_LICENSE("GPL");
drivers/ide/h8300/ide-h8300.c +3 -0
index 520aec0..4108ec4 100644
@@ -110,6 +110,7 @@ static int __init h8300_ide_init(void)
 	ide_init_port_data(hwif, index);
 	ide_init_port_hw(hwif, &hw);
 	hwif_setup(hwif);
+	hwif->host_flags = IDE_HFLAG_NO_IO_32BIT;
 	printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", index);
 
 	idx[0] = index;

@@ -125,3 +126,5 @@ out_busy:
 }
 
 module_init(h8300_ide_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/ide-iops.c +1 -1
index 01b9220..e77cee0 100644
@@ -658,7 +658,7 @@ int ide_driveid_update(ide_drive_t *drive)
 		local_irq_restore(flags);
 		return 0;
 	}
-	ata_input_data(drive, id, SECTOR_WORDS);
+	hwif->ata_input_data(drive, id, SECTOR_WORDS);
 	(void)ide_read_status(drive);	/* clear drive IRQ */
 	local_irq_enable();
 	local_irq_restore(flags);
drivers/ide/ide-pnp.c +2 -0
index b163b2e..c14bb53 100644
@@ -86,3 +86,5 @@ static void __exit pnpide_exit(void)
 
 module_init(pnpide_init);
 module_exit(pnpide_exit);
+
+MODULE_LICENSE("GPL");
drivers/ide/legacy/buddha.c +2 -0
index 50ffa87..fdd3791 100644
@@ -241,3 +241,5 @@ fail_base2:
 }
 
 module_init(buddha_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/legacy/falconide.c +2 -0
index 8949ce7..e950afa 100644
@@ -93,3 +93,5 @@ static int __init falconide_init(void)
 }
 
 module_init(falconide_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/legacy/gayle.c +2 -0
index b7d8109..e3b4638 100644
@@ -195,3 +195,5 @@ found:
 }
 
 module_init(gayle_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/legacy/macide.c +2 -0
index 9a79098..eaf5dbe 100644
@@ -137,3 +137,5 @@ static int __init macide_init(void)
 }
 
 module_init(macide_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/legacy/q40ide.c +2 -0
index 1381b91..2da2875 100644
@@ -153,3 +153,5 @@ static int __init q40ide_init(void)
 }
 
 module_init(q40ide_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/pci/cmd640.c +2 -0
index ec66798..29fbc5e 100644
@@ -881,3 +881,5 @@ module_param_named(probe_vlb, cmd640_vlb, bool, 0);
 MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset");
 
 module_init(cmd640x_init);
+
+MODULE_LICENSE("GPL");
drivers/ide/ppc/mpc8xx.c +2 -0
index 38fbfb8..ebaba01 100644
@@ -853,3 +853,5 @@ static int __init mpc8xx_ide_probe(void)
 }
 
 module_init(mpc8xx_ide_probe);
+
+MODULE_LICENSE("GPL");
drivers/ide/ppc/pmac.c +2 -0
index 78c9eeb..d9ca52e 100644
@@ -1771,3 +1771,5 @@ static int __devinit pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
 module_init(pmac_ide_probe);
+
+MODULE_LICENSE("GPL");