Commit 5e237e8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IDE updates from David Miller:

 1) Fix mem region name in tx4949ide driver, from Christophe JAILLET.

 2) Make drive->dn read only, it should not be changeable by users. From
    Dan Carpenter.

 3) Several cast fixups from Krzysztof Kozlowski.

There is also going to be a removal of a now unused IDE driver, but that
will come via the MIPS tree.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: make drive->dn read only
  ide: serverworks: potential overflow in svwks_set_pio_mode()
  cmd64x: potential buffer overflow in cmd64x_program_timings()
  ide: remove unneeded header include path to drivers/ide
  ide: qd65xx: Fix cast to pointer from integer of different size
  ide: ht6560b: Fix cast to pointer from integer of different size
  ide: remove set but not used variable 'hwif'
  ide: remove unnecessary touch_softlockup_watchdog
  ide: tx4939ide: Fix the name used in a 'devm_request_mem_region()' call
  ide: Use dev_get_drvdata where possible
parents 9ca4c642 2fd3c5c6

drivers/ide/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# link order is important here

#



ccflags-y				:= -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-sysfs.o ide-devsets.o \

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

drivers/ide/cmd64x.c

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode) 
	struct ide_timing t;

	u8 arttim = 0;



	if (drive->dn >= ARRAY_SIZE(drwtim_regs))

		return;



	ide_timing_compute(drive, mode, &t, T, 0);



	/*

drivers/ide/ht6560b.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void __init ht6560b_init_dev(ide_drive_t *drive) 
{

	ide_hwif_t *hwif = drive->hwif;

	/* Setting default configurations for drives. */

	int t = (HT_CONFIG_DEFAULT << 8) | HT_TIMING_DEFAULT;

	unsigned long t = (HT_CONFIG_DEFAULT << 8) | HT_TIMING_DEFAULT;



	if (hwif->channel)

		t |= (HT_SECONDARY_IF << 8);

drivers/ide/ide-iops.c

+0 −1
Original line number Diff line number Diff line
@@ -530,7 +530,6 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout) 
		 */

		if (stat == 0xff)

			return -ENODEV;

		touch_softlockup_watchdog();

		touch_nmi_watchdog();

	}

	return -EBUSY;

drivers/ide/ide-proc.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg) 
ide_devset_rw(current_speed, xfer_rate);

ide_devset_rw_field(init_speed, init_speed);

ide_devset_rw_flag(nice1, IDE_DFLAG_NICE1);

ide_devset_rw_field(number, dn);

ide_devset_ro_field(number, dn);



static const struct ide_proc_devset ide_generic_settings[] = {

	IDE_PROC_DEVSET(current_speed, 0, 70),

CRA Git | Maintained and supported by SUSTech CRA and CCSE