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

Commit fc212bb1 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: use pci_dev->revision 



Some places were using PCI_CLASS_REVISION instead of PCI_REVISION_ID so
they were not converted by commit 44c10138.

Cc: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 1afa6554

drivers/ide/pci/pdc202xx_new.c

+1 −5
Original line number Diff line number Diff line
@@ -332,16 +332,12 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base) 
static void __devinit apple_kiwi_init(struct pci_dev *pdev)

{

	struct device_node *np = pci_device_to_OF_node(pdev);

	unsigned int class_rev = 0;

	u8 conf;



	if (np == NULL || !of_device_is_compatible(np, "kiwi-root"))

		return;



	pci_read_config_dword(pdev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xff;



	if (class_rev >= 0x03) {

	if (pdev->revision >= 0x03) {

		/* Setup chip magic config stuff (from darwin) */

		pci_read_config_byte (pdev, 0x40, &conf);

		pci_write_config_byte(pdev, 0x40, (conf | 0x01));

drivers/ide/pci/sgiioc4.c

+3 −5
Original line number Diff line number Diff line
@@ -691,14 +691,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) 
static unsigned int __devinit

pci_init_sgiioc4(struct pci_dev *dev)

{

	unsigned int class_rev;

	int ret;



	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xff;

	printk(KERN_INFO "%s: IDE controller at PCI slot %s, revision %d\n",

			 DRV_NAME, pci_name(dev), class_rev);

	if (class_rev < IOC4_SUPPORTED_FIRMWARE_REV) {

			 DRV_NAME, pci_name(dev), dev->revision);



	if (dev->revision < IOC4_SUPPORTED_FIRMWARE_REV) {

		printk(KERN_ERR "Skipping %s IDE controller in slot %s: "

				"firmware is obsolete - please upgrade to "

				"revision46 or higher\n",

drivers/ide/pci/siimage.c

+4 −13
Original line number Diff line number Diff line
@@ -640,13 +640,9 @@ static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name) 


static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev, const char *name)

{

	u32 class_rev	= 0;

	u8 tmpbyte	= 0;

	u8 BA5_EN	= 0;

	u8 rev = dev->revision, tmpbyte = 0, BA5_EN = 0;



        pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

        class_rev &= 0xff;

	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (class_rev) ? 1 : 255);	

	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, rev ? 1 : 255);



	pci_read_config_byte(dev, 0x8A, &BA5_EN);

	if ((BA5_EN & 0x01) || (pci_resource_start(dev, 5))) {
@@ -825,19 +821,14 @@ static void __devinit siimage_fixup(ide_hwif_t *hwif) 


static void __devinit init_iops_siimage(ide_hwif_t *hwif)

{

	struct pci_dev *dev	= hwif->pci_dev;

	u32 class_rev		= 0;



	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xff;

	

	hwif->hwif_data = NULL;



	/* Pessimal until we finish probing */

	hwif->rqsize = 15;



	if (pci_get_drvdata(dev) == NULL)

	if (pci_get_drvdata(hwif->pci_dev) == NULL)

		return;



	init_mmio_iops_siimage(hwif);

}

drivers/ide/setup-pci.c

+2 −4
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi 
static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, int noisy, int *config)

{

	int ret;

	u32 class_rev;

	u16 pcicmd;



	if (noisy)
@@ -501,10 +500,9 @@ static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, in 
		printk(KERN_INFO "%s: device enabled (Linux)\n", d->name);

	}



	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xff;

	if (noisy)

		printk(KERN_INFO "%s: chipset revision %d\n", d->name, class_rev);

		printk(KERN_INFO "%s: chipset revision %d\n",

				 d->name, dev->revision);

out:

	return ret;

}