Commit f201f504 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] ide: housekeeping on IDE drivers 



Move auto arrays to static (const).  Clean up using PCI_DEVICE in places,
remove unreachable junk and dead code.

Fix the serverworks cable detect logic (if ordering is wrong).  Backport
from libata.  Plenty of scope for more cleanup left.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent da574af7

drivers/ide/pci/aec62xx.c

+8 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct chipset_bus_clock_list_entry { 
	u8 ultra_settings;

};



static struct chipset_bus_clock_list_entry aec6xxx_33_base [] = {

static const struct chipset_bus_clock_list_entry aec6xxx_33_base [] = {

	{	XFER_UDMA_6,	0x31,	0x07	},

	{	XFER_UDMA_5,	0x31,	0x06	},

	{	XFER_UDMA_4,	0x31,	0x05	},
@@ -42,7 +42,7 @@ static struct chipset_bus_clock_list_entry aec6xxx_33_base [] = { 
	{	0,		0x00,	0x00	}

};



static struct chipset_bus_clock_list_entry aec6xxx_34_base [] = {

static const struct chipset_bus_clock_list_entry aec6xxx_34_base [] = {

	{	XFER_UDMA_6,	0x41,	0x06	},

	{	XFER_UDMA_5,	0x41,	0x05	},

	{	XFER_UDMA_4,	0x41,	0x04	},
@@ -425,12 +425,12 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi 
	return d->init_setup(dev, d);

}



static struct pci_device_id aec62xx_pci_tbl[] = {

	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP850UF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },

	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860R,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },

	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },

	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865R,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },

static const struct pci_device_id aec62xx_pci_tbl[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP850UF), 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860), 1 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860R), 2 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865), 3 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865R), 4 },

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);

drivers/ide/pci/cmd64x.c

+0 −15
Original line number Diff line number Diff line
@@ -189,14 +189,6 @@ static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count) 


#endif	/* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */



/*

 * Registers and masks for easy access by drive index:

 */

#if 0

static u8 prefetch_regs[4]  = {CNTRL, CNTRL, ARTTIM23, ARTTIM23};

static u8 prefetch_masks[4] = {CNTRL_DIS_RA0, CNTRL_DIS_RA1, ARTTIM23_DIS_RA2, ARTTIM23_DIS_RA3};

#endif



/*

 * This routine writes the prepared setup/active/recovery counts

 * for a drive into the cmd646 chipset registers to active them.
@@ -606,13 +598,6 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha 
	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xff;



#ifdef __i386__

	if (dev->resource[PCI_ROM_RESOURCE].start) {

		pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);

		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);

	}

#endif



	switch(dev->device) {

		case PCI_DEVICE_ID_CMD_643:

			break;

drivers/ide/pci/serverworks.c

+16 −37
Original line number Diff line number Diff line
@@ -123,11 +123,11 @@ static u8 svwks_csb_check (struct pci_dev *dev) 
}

static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)

{

	u8 udma_modes[]		= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };

	u8 dma_modes[]		= { 0x77, 0x21, 0x20 };

	u8 pio_modes[]		= { 0x5d, 0x47, 0x34, 0x22, 0x20 };

	u8 drive_pci[]		= { 0x41, 0x40, 0x43, 0x42 };

	u8 drive_pci2[]		= { 0x45, 0x44, 0x47, 0x46 };

	static const u8 udma_modes[]		= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };

	static const u8 dma_modes[]		= { 0x77, 0x21, 0x20 };

	static const u8 pio_modes[]		= { 0x5d, 0x47, 0x34, 0x22, 0x20 };

	static const u8 drive_pci[]		= { 0x41, 0x40, 0x43, 0x42 };

	static const u8 drive_pci2[]		= { 0x45, 0x44, 0x47, 0x46 };



	ide_hwif_t *hwif	= HWIF(drive);

	struct pci_dev *dev	= hwif->pci_dev;
@@ -392,16 +392,6 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha 
			}

			outb_p(0x06, 0x0c00);

			dev->irq = inb_p(0x0c01);

#if 0

			printk("%s: device class (0x%04x)\n",

				name, dev->class);

			if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) {

				dev->class &= ~0x000F0F00;

		//		dev->class |= ~0x00000400;

				dev->class |= ~0x00010100;

				/**/

			}

#endif

		} else {

			struct pci_dev * findev = NULL;

			u8 reg41 = 0;
@@ -452,7 +442,7 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha 
		pci_write_config_byte(dev, 0x5A, btr);

	}



	return (dev->irq) ? dev->irq : 0;

	return dev->irq;

}



static unsigned int __devinit ata66_svwks_svwks (ide_hwif_t *hwif)
@@ -500,11 +490,6 @@ static unsigned int __devinit ata66_svwks (ide_hwif_t *hwif) 
{

	struct pci_dev *dev = hwif->pci_dev;



	/* Per Specified Design by OEM, and ASIC Architect */

	if ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||

	    (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2))

		return 1;



	/* Server Works */

	if (dev->subsystem_vendor == PCI_VENDOR_ID_SERVERWORKS)

		return ata66_svwks_svwks (hwif);
@@ -517,10 +502,14 @@ static unsigned int __devinit ata66_svwks (ide_hwif_t *hwif) 
	if (dev->subsystem_vendor == PCI_VENDOR_ID_SUN)

		return ata66_svwks_cobalt (hwif);



	/* Per Specified Design by OEM, and ASIC Architect */

	if ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||

	    (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2))

		return 1;



	return 0;

}



#undef CAN_SW_DMA

static void __devinit init_hwif_svwks (ide_hwif_t *hwif)

{

	u8 dma_stat = 0;
@@ -537,9 +526,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) 
		hwif->ultra_mask = 0x3f;



	hwif->mwdma_mask = 0x07;

#ifdef CAN_SW_DMA

	hwif->swdma_mask = 0x07;

#endif /* CAN_SW_DMA */



	hwif->autodma = 0;
@@ -562,8 +548,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) 
	hwif->drives[1].autodma = (dma_stat & 0x40);

	hwif->drives[0].autotune = (!(dma_stat & 0x20));

	hwif->drives[1].autotune = (!(dma_stat & 0x40));

//	hwif->drives[0].autodma = hwif->autodma;

//	hwif->drives[1].autodma = hwif->autodma;

}



/*
@@ -593,11 +577,6 @@ static int __devinit init_setup_csb6 (struct pci_dev *dev, ide_pci_device_t *d) 
		if (dev->resource[0].start == 0x01f1)

			d->bootable = ON_BOARD;

	}

#if 0

	if ((IDE_PCI_DEVID_EQ(d->devid, DEVID_CSB6) &&

             (!(PCI_FUNC(dev->devfn) & 1)))

		d->autodma = AUTODMA;

#endif



	d->channels = ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ||

			dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2) &&
@@ -671,11 +650,11 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device 
}



static struct pci_device_id svwks_pci_tbl[] = {

	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},

	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},

	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},

	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 1},

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE), 2},

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2), 3},

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE), 4},

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);

drivers/ide/pci/sl82c105.c

+1 −3
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif) 
		printk("    %s: Winbond 553 bridge revision %d, BM-DMA disabled\n",

		       hwif->name, rev);

	} else {

#ifdef CONFIG_BLK_DEV_IDEDMA

		dma_state |= 0x60;



		hwif->atapi_dma = 1;
@@ -468,7 +467,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif) 


		if (hwif->mate)

			hwif->serialized = hwif->mate->serialized = 1;

#endif /* CONFIG_BLK_DEV_IDEDMA */

	}

	hwif->OUTB(dma_state, hwif->dma_base + 2);

}
@@ -489,7 +487,7 @@ static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_dev 
}



static struct pci_device_id sl82c105_pci_tbl[] = {

	{ PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_DEVICE(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105), 0},

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);

drivers/ide/pci/slc90e66.c

+3 −8
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ static void slc90e66_tune_drive (ide_drive_t *drive, u8 pio) 
	u16 master_data;

	u8 slave_data;

				 /* ISP  RTC */

	u8 timings[][2]	= { { 0, 0 },

	static const u8 timings[][2]= {

				    { 0, 0 },

				    { 0, 0 },

				    { 1, 0 },

				    { 2, 1 },
@@ -119,7 +120,6 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed) 
	pci_read_config_word(dev, 0x4a, &reg4a);



	switch(speed) {

#ifdef CONFIG_BLK_DEV_IDEDMA

		case XFER_UDMA_4:	u_speed = 4 << (drive->dn * 4); break;

		case XFER_UDMA_3:	u_speed = 3 << (drive->dn * 4); break;

		case XFER_UDMA_2:	u_speed = 2 << (drive->dn * 4); break;
@@ -128,7 +128,6 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed) 
		case XFER_MW_DMA_2:

		case XFER_MW_DMA_1:

		case XFER_SW_DMA_2:	break;

#endif /* CONFIG_BLK_DEV_IDEDMA */

		case XFER_PIO_4:

		case XFER_PIO_3:

		case XFER_PIO_2:
@@ -156,7 +155,6 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed) 
	return (ide_config_drive_speed(drive, speed));

}



#ifdef CONFIG_BLK_DEV_IDEDMA

static int slc90e66_config_drive_for_dma (ide_drive_t *drive)

{

	u8 speed = ide_dma_speed(drive, slc90e66_ratemask(drive));
@@ -194,7 +192,6 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive) 
	/* IORDY not supported */

	return 0;

}

#endif /* CONFIG_BLK_DEV_IDEDMA */



static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)

{
@@ -222,7 +219,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) 
	hwif->mwdma_mask = 0x07;

	hwif->swdma_mask = 0x07;



#ifdef CONFIG_BLK_DEV_IDEDMA 

	if (!(hwif->udma_four))

		/* bit[0(1)]: 0:80, 1:40 */

		hwif->udma_four = (reg47 & mask) ? 0 : 1;
@@ -232,7 +228,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) 
		hwif->autodma = 1;

	hwif->drives[0].autodma = hwif->autodma;

	hwif->drives[1].autodma = hwif->autodma;

#endif /* !CONFIG_BLK_DEV_IDEDMA */

}



static ide_pci_device_t slc90e66_chipset __devinitdata = {
@@ -250,7 +245,7 @@ static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_dev 
}



static struct pci_device_id slc90e66_pci_tbl[] = {

	{ PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1), 0},

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);