Commit e49aedb5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
  sl82c105: remove no longer needed debugging code
  sis5513: remove stale TODO
  pdc202xx_old: remove no longer needed debugging code
  cy82c693: remove no longer needed debugging code
  cmd64x: remove no longer needed debugging code
  alim15x3: remove obsolete and dangerous wdc_udma parameter
  ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
  cs5535: add pci id for AMD based CS5535 controllers
  slc90e66: fix UDMA handling
  drivers/ide/tx4938ide.c: use resource_size()
  drivers/ide/ide_platform.c: use resource_size()
  drivers/ide/au1xxx-ide.c: use resource_size()
  hpt366: remove dead old timing tables
  ide: update Kconfig text to mark as deprecated
  ide-tape: remove the BKL
  hpt366: kill unused #define's
parents 4ef58d4e 4e5b932c

drivers/ide/Kconfig

+10 −35
Original line number Diff line number Diff line
@@ -7,50 +7,25 @@ config HAVE_IDE 
	bool



menuconfig IDE

	tristate "ATA/ATAPI/MFM/RLL support"

	tristate "ATA/ATAPI/MFM/RLL support (DEPRECATED)"

	depends on HAVE_IDE

	depends on BLOCK

	---help---

	  If you say Y here, your kernel will be able to manage low cost mass

	  storage units such as ATA/(E)IDE and ATAPI units. The most common

	  cases are IDE hard drives and ATAPI CD-ROM drives.



	  If your system is pure SCSI and doesn't use these interfaces, you

	  can say N here.



	  Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard

	  for mass storage units such as hard disks. It was designed by

	  Western Digital and Compaq Computer in 1984. It was then named

	  ST506. Quite a number of disks use the IDE interface.



	  AT Attachment (ATA) is the superset of the IDE specifications.

	  ST506 was also called ATA-1.



	  Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is

	  ATA-3. It provides support for larger disks (up to 8.4GB by means of

	  the LBA standard), more disks (4 instead of 2) and for other mass

	  storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is

	  ATA-4 and provides faster (and more CPU friendly) transfer modes

	  than previous PIO (Programmed processor Input/Output) from previous

	  ATA/IDE standards by means of fast DMA controllers.



	  ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and

	  CD-ROM drives, similar in many respects to the SCSI protocol.



	  SMART IDE (Self Monitoring, Analysis and Reporting Technology) was

	  designed in order to prevent data corruption and disk crash by

	  detecting pre hardware failure conditions (heat, access time, and

	  the like...). Disks built since June 1995 may follow this standard.

	  The kernel itself doesn't manage this; however there are quite a

	  number of user programs such as smart that can query the status of

	  SMART parameters from disk drives.

	  If you say Y here, your kernel will be able to manage ATA/(E)IDE and

	  ATAPI units. The most common cases are IDE hard drives and ATAPI

	  CD-ROM drives.



	  This subsystem is currently in maintenance mode with only bug fix

	  changes applied. Users of ATA hardware are encouraged to migrate to

	  the newer ATA subsystem ("Serial ATA (prod) and Parallel ATA

	  (experimental) drivers") which is more actively maintained.



	  To compile this driver as a module, choose M here: the

	  module will be called ide-core.



	  For further information, please read <file:Documentation/ide/ide.txt>.



	  If unsure, say Y.

	  If unsure, say N.



if IDE

drivers/ide/alim15x3.c

+1 −11
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ 


#define DRV_NAME "alim15x3"



/*

 * Allow UDMA on M1543C-E chipset for WDC disks that ignore CRC checking

 * (this is DANGEROUS and could result in data corruption).

 */

static int wdc_udma;



module_param(wdc_udma, bool, 0);

MODULE_PARM_DESC(wdc_udma,

		 "allow UDMA on M1543C-E chipset for WDC disks (DANGEROUS)");



/*

 *	ALi devices are not plug in. Otherwise these static values would

 *	need to go. They ought to go away anyway
@@ -132,7 +122,7 @@ static u8 ali_udma_filter(ide_drive_t *drive) 
	if (m5229_revision > 0x20 && m5229_revision < 0xC2) {

		if (drive->media != ide_disk)

			return 0;

		if (wdc_udma == 0 && chip_is_1543c_e &&

		if (chip_is_1543c_e &&

		    strstr((char *)&drive->id[ATA_ID_PROD], "WDC "))

			return 0;

	}

drivers/ide/au1xxx-ide.c

+3 −4
Original line number Diff line number Diff line
@@ -532,14 +532,13 @@ static int au_ide_probe(struct platform_device *dev) 
		goto out;

	}



	if (!request_mem_region(res->start, res->end - res->start + 1,

				dev->name)) {

	if (!request_mem_region(res->start, resource_size(res), dev->name)) {

		pr_debug("%s: request_mem_region failed\n", DRV_NAME);

		ret =  -EBUSY;

		goto out;

	}



	ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);

	ahwif->regbase = (u32)ioremap(res->start, resource_size(res));

	if (ahwif->regbase == 0) {

		ret = -ENOMEM;

		goto out;
@@ -575,7 +574,7 @@ static int au_ide_remove(struct platform_device *dev) 
	iounmap((void *)ahwif->regbase);



	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

	release_mem_region(res->start, res->end - res->start + 1);

	release_mem_region(res->start, resource_size(res));



	return 0;

}

drivers/ide/cmd64x.c

+0 −17
Original line number Diff line number Diff line
@@ -20,14 +20,6 @@ 


#define DRV_NAME "cmd64x"



#define CMD_DEBUG 0



#if CMD_DEBUG

#define cmdprintk(x...)	printk(x)

#else

#define cmdprintk(x...)

#endif



/*

 * CMD64x specific registers definition.

 */
@@ -76,9 +68,6 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_ 
		{15, 15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0};

	static const u8 drwtim_regs[4] = {DRWTIM0, DRWTIM1, DRWTIM2, DRWTIM3};



	cmdprintk("program_cycle_times parameters: total=%d, active=%d\n",

		  cycle_time, active_time);



	cycle_count	= quantize_timing( cycle_time, clock_time);

	active_count	= quantize_timing(active_time, clock_time);

	recovery_count	= cycle_count - active_count;
@@ -94,9 +83,6 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_ 
	if (active_count > 16)		/* shouldn't actually happen... */

	 	active_count = 16;



	cmdprintk("Final counts: total=%d, active=%d, recovery=%d\n",

		  cycle_count, active_count, recovery_count);



	/*

	 * Convert values to internal chipset representation

	 */
@@ -106,7 +92,6 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_ 
	/* Program the active/recovery counts into the DRWTIM register */

	drwtim = (active_count << 4) | recovery_count;

	(void) pci_write_config_byte(dev, drwtim_regs[drive->dn], drwtim);

	cmdprintk("Write 0x%02x to reg 0x%x\n", drwtim, drwtim_regs[drive->dn]);

}



/*
@@ -150,7 +135,6 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio) 


	if (setup_count > 5)		/* shouldn't actually happen... */

		setup_count = 5;

	cmdprintk("Final address setup count: %d\n", setup_count);



	/*

	 * Program the address setup clocks into the ARTTIM registers.
@@ -162,7 +146,6 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio) 
	arttim &= ~0xc0;

	arttim |= setup_values[setup_count];

	(void) pci_write_config_byte(dev, arttim_regs[drive->dn], arttim);

	cmdprintk("Write 0x%02x to reg 0x%x\n", arttim, arttim_regs[drive->dn]);

}



/*

drivers/ide/cs5535.c

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ static int __devinit cs5535_init_one(struct pci_dev *dev, 


static const struct pci_device_id cs5535_pci_tbl[] = {

	{ PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), },

	{ 0, },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE