X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fagp%2Fsworks-agp.c;h=d3f3e80ff317dd3e8e1e9aac62f98c0f123e23c9;hb=89d192394c0ea1b5d433957770a47418e56acf92;hp=44e11acbcad77eaa9939bd2a7d22665ba2761add;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c index 44e11acbc..d3f3e80ff 100644 --- a/drivers/char/agp/sworks-agp.c +++ b/drivers/char/agp/sworks-agp.c @@ -447,7 +447,6 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, struct agp_bridge_data *bridge; struct pci_dev *bridge_dev; u32 temp, temp2; - u8 cap_ptr = 0; /* Everything is on func 1 here so we are hardcoding function one */ bridge_dev = pci_find_slot((unsigned int)pdev->bus->number, @@ -458,8 +457,6 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, return -ENODEV; } - cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP); - switch (pdev->device) { case 0x0006: /* ServerWorks CNB20HE @@ -473,15 +470,14 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, break; default: - if (cap_ptr) - printk(KERN_ERR PFX "Unsupported Serverworks chipset " - "(device id: %04x)\n", pdev->device); + printk(KERN_ERR PFX "Unsupported Serverworks chipset " + "(device id: %04x)\n", pdev->device); return -ENODEV; } serverworks_private.svrwrks_dev = bridge_dev; serverworks_private.gart_addr_ofs = 0x10; - + pci_read_config_dword(pdev, SVWRKS_APSIZE, &temp); if (temp & PCI_BASE_ADDRESS_MEM_TYPE_64) { pci_read_config_dword(pdev, SVWRKS_APSIZE + 4, &temp2);