Commit 1116fae5 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: config_drive_for_dma() fixes 



* Add DMA blacklist checking (->ide_dma_on check probably can go now).

* Add ->atapi_dma flag checking and remove no longer needed
  ns87415_ide_dma_check() from ns87415 host driver.

* Remove now needless __ide_dma_check() wrapper and symbol export.

* Check drive->autodma instead of hwif->autodma (there should be no changes in
  behavior as all users of config_drive_for_dma() set both ->autodma flags).

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 8292e8c7

drivers/ide/ide-dma.c

+10 −16
Original line number Diff line number Diff line
@@ -349,9 +349,17 @@ EXPORT_SYMBOL_GPL(ide_destroy_dmatable); 
 

static int config_drive_for_dma (ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct hd_driveid *id = drive->id;



	if ((id->capability & 1) && drive->hwif->autodma) {

	/* consult the list of known "bad" drives */

	if (__ide_dma_bad_drive(drive))

		return -1;



	if (drive->media != ide_disk && hwif->atapi_dma == 0)

		return -1;



	if ((id->capability & 1) && drive->autodma) {

		/*

		 * Enable DMA on any drive that has

		 * UltraDMA (mode 0/1/2/3/4/5/6) enabled
@@ -513,20 +521,6 @@ int __ide_dma_on (ide_drive_t *drive) 


EXPORT_SYMBOL(__ide_dma_on);



/**

 *	__ide_dma_check		-	check DMA setup

 *	@drive: drive to check

 *

 *	Don't use - due for extermination

 */

 

int __ide_dma_check (ide_drive_t *drive)

{

	return config_drive_for_dma(drive);

}



EXPORT_SYMBOL(__ide_dma_check);



/**

 *	ide_dma_setup	-	begin a DMA phase

 *	@drive: target device
@@ -1021,7 +1015,7 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p 
	if (!hwif->dma_host_on)

		hwif->dma_host_on = &ide_dma_host_on;

	if (!hwif->ide_dma_check)

		hwif->ide_dma_check = &__ide_dma_check;

		hwif->ide_dma_check = &config_drive_for_dma;

	if (!hwif->dma_setup)

		hwif->dma_setup = &ide_dma_setup;

	if (!hwif->dma_exec_cmd)

drivers/ide/pci/ns87415.c

+0 −9
Original line number Diff line number Diff line
@@ -187,14 +187,6 @@ static int ns87415_ide_dma_setup(ide_drive_t *drive) 
	return 1;

}



static int ns87415_ide_dma_check (ide_drive_t *drive)

{

	if (drive->media != ide_disk)

		return -1;



	return __ide_dma_check(drive);

}



static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)

{

	struct pci_dev *dev = hwif->pci_dev;
@@ -266,7 +258,6 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) 


	outb(0x60, hwif->dma_status);

	hwif->dma_setup = &ns87415_ide_dma_setup;

	hwif->ide_dma_check = &ns87415_ide_dma_check;

	hwif->ide_dma_end = &ns87415_ide_dma_end;



	if (!noautodma)

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,6 @@ void ide_dma_host_off(ide_drive_t *); 
void ide_dma_off_quietly(ide_drive_t *);

void ide_dma_host_on(ide_drive_t *);

extern int __ide_dma_on(ide_drive_t *);

extern int __ide_dma_check(ide_drive_t *);

extern int ide_dma_setup(ide_drive_t *);

extern void ide_dma_start(ide_drive_t *);

extern int __ide_dma_end(ide_drive_t *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE