diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:36 -0400 |
commit | 8a455134091a2ed8012365fcdf5692b80c9bb192 (patch) | |
tree | d2c9a29d5b6543a050b4715b3a311aeedbdd2311 | |
parent | bbc615b16d64643a3d22ab4890fde1a685e86d83 (diff) |
ide: remove dead code from ide_driveid_update()
* Remove dead code from ide_driveid_update().
While at it:
* Remove useless comment.
* s/HWIF(drive)/drive->hwif/
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ide-iops.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index d4d790f91f91..95168833d069 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -693,35 +693,16 @@ static u8 ide_auto_reduce_xfer (ide_drive_t *drive) | |||
693 | } | 693 | } |
694 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | 694 | #endif /* CONFIG_BLK_DEV_IDEDMA */ |
695 | 695 | ||
696 | /* | 696 | int ide_driveid_update(ide_drive_t *drive) |
697 | * Update the | ||
698 | */ | ||
699 | int ide_driveid_update (ide_drive_t *drive) | ||
700 | { | 697 | { |
701 | ide_hwif_t *hwif = HWIF(drive); | 698 | ide_hwif_t *hwif = drive->hwif; |
702 | struct hd_driveid *id; | 699 | struct hd_driveid *id; |
703 | #if 0 | 700 | unsigned long timeout, flags; |
704 | id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC); | ||
705 | if (!id) | ||
706 | return 0; | ||
707 | |||
708 | taskfile_lib_get_identify(drive, (char *)&id); | ||
709 | 701 | ||
710 | ide_fix_driveid(id); | ||
711 | if (id) { | ||
712 | drive->id->dma_ultra = id->dma_ultra; | ||
713 | drive->id->dma_mword = id->dma_mword; | ||
714 | drive->id->dma_1word = id->dma_1word; | ||
715 | /* anything more ? */ | ||
716 | kfree(id); | ||
717 | } | ||
718 | return 1; | ||
719 | #else | ||
720 | /* | 702 | /* |
721 | * Re-read drive->id for possible DMA mode | 703 | * Re-read drive->id for possible DMA mode |
722 | * change (copied from ide-probe.c) | 704 | * change (copied from ide-probe.c) |
723 | */ | 705 | */ |
724 | unsigned long timeout, flags; | ||
725 | 706 | ||
726 | SELECT_MASK(drive, 1); | 707 | SELECT_MASK(drive, 1); |
727 | if (IDE_CONTROL_REG) | 708 | if (IDE_CONTROL_REG) |
@@ -763,7 +744,6 @@ int ide_driveid_update (ide_drive_t *drive) | |||
763 | } | 744 | } |
764 | 745 | ||
765 | return 1; | 746 | return 1; |
766 | #endif | ||
767 | } | 747 | } |
768 | 748 | ||
769 | int ide_config_drive_speed(ide_drive_t *drive, u8 speed) | 749 | int ide_config_drive_speed(ide_drive_t *drive, u8 speed) |