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

Commit bc2fd381 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: (53 commits)
  ide: use try_to_identify() in ide_driveid_update()
  ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update()
  ide: sanitize SELECT_MASK() usage in ide_driveid_update()
  ide: classify device type in do_probe()
  ide: remove broken EXABYTENEST support
  ide: shorten timeout value in ide_driveid_update()
  ide: propagate AltStatus workarounds to ide_driveid_update()
  ide: fix kmalloc() failure handling in ide_driveid_update()
  mn10300: remove <asm/ide.h>
  frv: remove <asm/ide.h>
  ide: remove pciirq argument from ide_pci_setup_ports()
  ide: fix ->init_chipset method to return 'int' value
  ide: remove try_to_identify() wrapper
  ide: remove no longer needed IRQ auto-probing from try_to_identify() (v2)
  ide: remove no longer needed IRQ fallback code from hwif_init()
  amd74xx: remove no longer needed ->init_hwif method
  ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS
  ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}()
  ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}()
  ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}()
  ...
parents 928a726b 2ebe1d9e

drivers/ide/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -56,8 +56,12 @@ if IDE 


comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"



config IDE_XFER_MODE

	bool



config IDE_TIMINGS

	bool

	select IDE_XFER_MODE



config IDE_ATAPI

	bool
@@ -698,6 +702,7 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST 
config BLK_DEV_IDE_AU1XXX

       bool "IDE for AMD Alchemy Au1200"

       depends on SOC_AU1200

       select IDE_XFER_MODE

choice

       prompt "IDE Mode for AMD Alchemy Au1200"

       default CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA
@@ -871,6 +876,7 @@ config BLK_DEV_ALI14XX 


config BLK_DEV_DTC2278

	tristate "DTC-2278 support"

	select IDE_XFER_MODE

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "dtc2278.probe" kernel
@@ -902,6 +908,7 @@ config BLK_DEV_QD65XX 


config BLK_DEV_UMC8672

	tristate "UMC-8672 support"

	select IDE_XFER_MODE

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "umc8672.probe" kernel
@@ -915,5 +922,6 @@ endif 
config BLK_DEV_IDEDMA

	def_bool BLK_DEV_IDEDMA_SFF || \

		 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

	select IDE_XFER_MODE



endif # IDE

drivers/ide/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ 
EXTRA_CFLAGS				+= -Idrivers/ide



ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \

	      ide-taskfile.o ide-pm.o ide-park.o ide-pio-blacklist.o ide-sysfs.o

	      ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \

	      ide-io-std.o ide-eh.o



# core IDE code

ide-core-$(CONFIG_IDE_XFER_MODE)	+= ide-pio-blacklist.o ide-xfer-mode.o

ide-core-$(CONFIG_IDE_TIMINGS)		+= ide-timings.o

ide-core-$(CONFIG_IDE_ATAPI)		+= ide-atapi.o

ide-core-$(CONFIG_BLK_DEV_IDEPCI)	+= setup-pci.o

drivers/ide/aec62xx.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);

}



static unsigned int init_chipset_aec62xx(struct pci_dev *dev)

static int init_chipset_aec62xx(struct pci_dev *dev)

{

	/* These are necessary to get AEC6280 Macintosh cards to work */

	if ((dev->device == PCI_DEVICE_ID_ARTOP_ATP865) ||
@@ -156,7 +156,7 @@ static unsigned int init_chipset_aec62xx(struct pci_dev *dev) 
		pci_write_config_byte(dev, 0x4a, reg4ah | 0x80);

	}



	return dev->irq;

	return 0;

}



static u8 atp86x_cable_detect(ide_hwif_t *hwif)

drivers/ide/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int ali15x3_dma_setup(ide_drive_t *drive) 
 *	appropriate also sets up the 1533 southbridge.

 */



static unsigned int init_chipset_ali15x3(struct pci_dev *dev)

static int init_chipset_ali15x3(struct pci_dev *dev)

{

	unsigned long flags;

	u8 tmpbyte;

drivers/ide/amd74xx.c

+2 −12
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void amd7411_cable_detect(struct pci_dev *dev) 
 * The initialization callback.  Initialize drive independent registers.

 */



static unsigned int init_chipset_amd74xx(struct pci_dev *dev)

static int init_chipset_amd74xx(struct pci_dev *dev)

{

	u8 t = 0, offset = amd_offset(dev);
@@ -172,7 +172,7 @@ static unsigned int init_chipset_amd74xx(struct pci_dev *dev) 
		t |= 0xf0;

	pci_write_config_byte(dev, AMD_IDE_CONFIG + offset, t);



	return dev->irq;

	return 0;

}



static u8 amd_cable_detect(ide_hwif_t *hwif)
@@ -183,14 +183,6 @@ static u8 amd_cable_detect(ide_hwif_t *hwif) 
		return ATA_CBL_PATA40;

}



static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);



	if (hwif->irq == 0) /* 0 is bogus but will do for now */

		hwif->irq = pci_get_legacy_ide_irq(dev, hwif->channel);

}



static const struct ide_port_ops amd_port_ops = {

	.set_pio_mode		= amd_set_pio_mode,

	.set_dma_mode		= amd_set_drive,
@@ -207,7 +199,6 @@ static const struct ide_port_ops amd_port_ops = { 
	{								\

		.name		= DRV_NAME,				\

		.init_chipset	= init_chipset_amd74xx,			\

		.init_hwif	= init_hwif_amd74xx,			\

		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},	\

		.port_ops	= &amd_port_ops,			\

		.host_flags	= IDE_HFLAGS_AMD,			\
@@ -221,7 +212,6 @@ static const struct ide_port_ops amd_port_ops = { 
	{								\

		.name		= DRV_NAME,				\

		.init_chipset	= init_chipset_amd74xx,			\

		.init_hwif	= init_hwif_amd74xx,			\

		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},	\

		.port_ops	= &amd_port_ops,			\

		.host_flags	= IDE_HFLAGS_AMD,			\