Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1292ebb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (61 commits)
  ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag
  sis5513: fail early for unsupported chipsets
  it821x: fix kzalloc() failure handling
  qd65xx: use IDE_HFLAG_SINGLE host flag
  qd65xx: always use ->selectproc method
  ide-cd: put proc-related functions together under single ifdef
  ide-cd: Replace __FUNCTION__ with __func__
  IDE: Coding Style fixes to drivers/ide/ide-cd.c
  IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
  IDE: Coding Style fixes to drivers/ide/pci/it8213.c
  IDE: Coding Style fixes to drivers/ide/ide-floppy.c
  IDE: Coding Style fixes to drivers/ide/legacy/ali14xx.c
  IDE: Coding Style fixes to drivers/ide/legacy/hd.c
  IDE: Coding Style fixes to drivers/ide/pci/cmd640.c
  IDE: Coding Style fixes to drivers/ide/pci/opti621.c
  IDE: Coding Style fixes to drivers/ide/ide-pnp.c
  IDE: Coding Style fixes to drivers/ide/ide-proc.c
  IDE: Coding Style fixes to drivers/ide/legacy/ide-4drives.c
  IDE: Coding Style fixes to drivers/ide/legacy/umc8672.c
  IDE: Coding Style fixes to drivers/ide/pci/generic.c
  ...
parents b8228758 784506cb

drivers/ide/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ comment "Other IDE chipsets support" 
comment "Note: most of these also require special kernel boot parameters"



config BLK_DEV_4DRIVES

	bool "Generic 4 drives/port support"

	tristate "Generic 4 drives/port support"

	help

	  Certain older chipsets, including the Tekram 690CD, use a single set

	  of I/O ports at 0x1f0 to control up to four drives, instead of the

drivers/ide/arm/bast-ide.c

+11 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <asm/arch/bast-map.h>

#include <asm/arch/bast-irq.h>



#define DRV_NAME "bast-ide"



static int __init bastide_register(unsigned int base, unsigned int aux, int irq)

{

	ide_hwif_t *hwif;
@@ -41,7 +43,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq) 
	hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);

	hw.irq = irq;



	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	hwif = ide_find_port();

	if (hwif == NULL)

		goto out;
@@ -53,6 +55,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq) 
		ide_init_port_data(hwif, i);



	ide_init_port_hw(hwif, &hw);

	hwif->mmio = 1;

	hwif->quirkproc = NULL;



	idx[0] = i;
@@ -64,6 +67,8 @@ out: 


static int __init bastide_init(void)

{

	unsigned long base = BAST_VA_IDEPRI + BAST_IDE_CS;



	/* we can treat the VR1000 and the BAST the same */



	if (!(machine_is_bast() || machine_is_vr1000()))
@@ -71,6 +76,11 @@ static int __init bastide_init(void) 


	printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n");



	if (!request_mem_region(base, 0x400000, DRV_NAME)) {

		printk(KERN_ERR "%s: resources busy\n", DRV_NAME);

		return -EBUSY;

	}



	bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);

	bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);

drivers/ide/arm/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e 
	unsigned long port = (unsigned long)base + info->dataoffset;

	ide_hwif_t *hwif;



	hwif = ide_find_port(port);

	hwif = ide_find_port();

	if (hwif) {

		int i;

drivers/ide/arm/ide_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int __init ide_arm_init(void) 
	ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);

	hw.irq = IDE_ARM_IRQ;



	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	hwif = ide_find_port();

	if (hwif) {

		ide_init_port_hw(hwif, &hw);

		idx[0] = hwif->index;

drivers/ide/arm/palm_bk3710.c

+13 −13
Original line number Diff line number Diff line
@@ -96,11 +96,11 @@ static void palm_bk3710_setudmamode(void __iomem *base, unsigned int dev, 
	u16 val16;



	/* DMA Data Setup */

	t0 = (palm_bk3710_udmatimings[mode].cycletime + ide_palm_clk - 1)

			/ ide_palm_clk - 1;

	tenv = (20 + ide_palm_clk - 1) / ide_palm_clk - 1;

	trp = (palm_bk3710_udmatimings[mode].rptime + ide_palm_clk - 1)

			/ ide_palm_clk - 1;

	t0 = DIV_ROUND_UP(palm_bk3710_udmatimings[mode].cycletime,

			  ide_palm_clk) - 1;

	tenv = DIV_ROUND_UP(20, ide_palm_clk) - 1;

	trp = DIV_ROUND_UP(palm_bk3710_udmatimings[mode].rptime,

			   ide_palm_clk) - 1;



	/* udmatim Register */

	val16 = readw(base + BK3710_UDMATIM) & (dev ? 0xFF0F : 0xFFF0);
@@ -141,8 +141,8 @@ static void palm_bk3710_setdmamode(void __iomem *base, unsigned int dev, 
	cycletime = max_t(int, t->cycle, min_cycle);



	/* DMA Data Setup */

	t0 = (cycletime + ide_palm_clk - 1) / ide_palm_clk;

	td = (t->active + ide_palm_clk - 1) / ide_palm_clk;

	t0 = DIV_ROUND_UP(cycletime, ide_palm_clk);

	td = DIV_ROUND_UP(t->active, ide_palm_clk);

	tkw = t0 - td - 1;

	td -= 1;
@@ -168,9 +168,9 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate, 
	struct ide_timing *t;



	/* PIO Data Setup */

	t0 = (cycletime + ide_palm_clk - 1) / ide_palm_clk;

	t2 = (ide_timing_find_mode(XFER_PIO_0 + mode)->active +

	      ide_palm_clk - 1)	/ ide_palm_clk;

	t0 = DIV_ROUND_UP(cycletime, ide_palm_clk);

	t2 = DIV_ROUND_UP(ide_timing_find_mode(XFER_PIO_0 + mode)->active,

			  ide_palm_clk);



	t2i = t0 - t2 - 1;

	t2 -= 1;
@@ -192,8 +192,8 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate, 


	/* TASKFILE Setup */

	t = ide_timing_find_mode(XFER_PIO_0 + mode);

	t0 = (t->cyc8b + ide_palm_clk - 1) / ide_palm_clk;

	t2 = (t->act8b + ide_palm_clk - 1) / ide_palm_clk;

	t0 = DIV_ROUND_UP(t->cyc8b, ide_palm_clk);

	t2 = DIV_ROUND_UP(t->act8b, ide_palm_clk);



	t2i = t0 - t2 - 1;

	t2 -= 1;
@@ -378,7 +378,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 
	hw.irq = irq->start;

	hw.chipset = ide_palm3710;



	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	hwif = ide_find_port();

	if (hwif == NULL)

		goto out;