浏览代码

ide: unexport ide_set_xfer_rate() (v2)

In cmd64x, siimage and scc_pata drivers:
* don't set drive->init_speed as it should be already
  set by successful execution of ide_set_xfer_rate()
* use hwif->speedproc functions directly

Above changes allows removal of EXPORT_SYMBOL_GPL(ide_set_xfer_rate).

v2:
* updated for scc_pata driver

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 18 年之前
父节点
当前提交
056a697b73
共有 4 个文件被更改,包括 4 次插入15 次删除
  1. 0 2
      drivers/ide/ide-lib.c
  2. 2 5
      drivers/ide/pci/cmd64x.c
  3. 1 4
      drivers/ide/pci/siimage.c
  4. 1 4
      drivers/ide/ppc/scc_pata.c

+ 0 - 2
drivers/ide/ide-lib.c

@@ -459,8 +459,6 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 		return -1;
 }
 
-EXPORT_SYMBOL_GPL(ide_set_xfer_rate);
-
 static void ide_dump_opcode(ide_drive_t *drive)
 {
 	struct request *rq;

+ 2 - 5
drivers/ide/pci/cmd64x.c

@@ -466,11 +466,8 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 	if (!speed)
 		return 0;
 
-	if(ide_set_xfer_rate(drive, speed))
-		return 0; 
-
-	if (!drive->init_speed)
-		drive->init_speed = speed;
+	if (cmd64x_tune_chipset(drive, speed))
+		return 0;
 
 	return ide_dma_enable(drive);
 }

+ 1 - 4
drivers/ide/pci/siimage.c

@@ -396,12 +396,9 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 	if (!speed)
 		return 0;
 
-	if (ide_set_xfer_rate(drive, speed))
+	if (siimage_tune_chipset(drive, speed))
 		return 0;
 
-	if (!drive->init_speed)
-		drive->init_speed = speed;
-
 	return ide_dma_enable(drive);
 }
 

+ 1 - 4
drivers/ide/ppc/scc_pata.c

@@ -363,12 +363,9 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive)
 	if (!speed)
 		return 0;
 
-	if (ide_set_xfer_rate(drive, speed))
+	if (scc_tune_chipset(drive, speed))
 		return 0;
 
-	if (!drive->init_speed)
-		drive->init_speed = speed;
-
 	return ide_dma_enable(drive);
 }