Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d24ec426 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

pdc202xx_new: 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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 27210314

drivers/ide/pci/pdc202xx_new.c

+6 −21
Original line number Diff line number Diff line
@@ -92,26 +92,6 @@ static u8 pdcnew_ratemask(ide_drive_t *drive) 
	return	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
Original line number Diff line number Diff line
@@ -123,26 +123,6 @@ static u8 pdc202xx_ratemask (ide_drive_t *drive) 
	return 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)