(2.6.19-rc6-mm2) pdc202xx_*: remove check_in_drive_lists() abomination
PATCH 1/1 (2.6.19-rc6-mm2) pdc202xx_*: remove check_in_drive_lists() abomination
Fold check_in_drive_lists() into quirkproc() handler in both PDC202xx drivers-- this function was never called with a list other than pdc_quirk_drives and was a bad example of code overall...
Signed-off-by Sergei Shtylyov <[email protected]>
drivers/ide/pci/pdc202xx_new.c | 27 ++++++--------------------- drivers/ide/pci/pdc202xx_old.c | 27 ++++++--------------------- 2 files changed, 12 insertions(+), 42 deletions(-)
drivers/ide/pci/pdc202xx_new.c +6 -21
@@ -92,26 +92,6 @@ static u8 pdcnew_ratemask(ide_drive_t *dreturn mode; } -static int check_in_drive_lists (ide_drive_t *drive,const char **list) -{ -struct hd_driveid *id = drive->id; - -if (pdc_quirk_drives == list) { -while (*list) { -if (strstr (id->model, *list++)) { -return 2 ; - } - } - }else { -while (*list) { -if (!strcmp (*list++,id->model)) { -return 1 ; - } - } - } -return 0 ; -} -/** * get_indexed_reg - Get indexed register * @hwif: for the port address
@@ -324,7 +304,12 @@ fast_ata_pio:static int pdcnew_quirkproc (ide_drive_t *drive) { -return check_in_drive_lists (drive, pdc_quirk_drives); +const char **list, *model = drive->id->model; + +for (list = pdc_quirk_drives; *list !=NULL ; list++) +if (strstr (model, *list) !=NULL ) +return 2 ; +return 0 ; }static void pdcnew_reset (ide_drive_t *drive)
drivers/ide/pci/pdc202xx_old.c +6 -21
@@ -123,26 +123,6 @@ static u8 pdc202xx_ratemask (ide_drive_treturn mode; } -static int check_in_drive_lists (ide_drive_t *drive,const char **list) -{ -struct hd_driveid *id = drive->id; - -if (pdc_quirk_drives == list) { -while (*list) { -if (strstr (id->model, *list++)) { -return 2 ; - } - } - }else { -while (*list) { -if (!strcmp (*list++,id->model)) { -return 1 ; - } - } - } -return 0 ; -} -static int pdc202xx_tune_chipset (ide_drive_t *drive,u8 xferspeed) {ide_hwif_t *hwif =HWIF (drive);
@@ -377,7 +357,12 @@ fast_ata_pio:static int pdc202xx_quirkproc (ide_drive_t *drive) { -return ((int )check_in_drive_lists (drive, pdc_quirk_drives)); +const char **list, *model = drive->id->model; + +for (list = pdc_quirk_drives; *list !=NULL ; list++) +if (strstr (model, *list) !=NULL ) +return 2 ; +return 0 ; }static void pdc202xx_old_ide_dma_start (ide_drive_t *drive)