diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-09-26 12:56:55 -0400 |
---|---|---|
committer | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2006-09-26 23:05:55 -0400 |
commit | 7357db1209f27210f97b2a9dd22177f1886a1198 (patch) | |
tree | bd02a20804f36dfe87418b0fee3267d1d021b6ac | |
parent | b278240839e20fa9384ea430df463b367b90e04e (diff) |
[AGPGART] Use pci_get_slot not pci_find_slot
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 8cd52984cda5..00b17ae39736 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -409,7 +409,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) | |||
409 | int i; | 409 | int i; |
410 | unsigned size = amd64_fetch_size(); | 410 | unsigned size = amd64_fetch_size(); |
411 | printk(KERN_INFO "Setting up ULi AGP.\n"); | 411 | printk(KERN_INFO "Setting up ULi AGP.\n"); |
412 | dev1 = pci_find_slot ((unsigned int)pdev->bus->number,PCI_DEVFN(0,0)); | 412 | dev1 = pci_get_slot (pdev->bus,PCI_DEVFN(0,0)); |
413 | if (dev1 == NULL) { | 413 | if (dev1 == NULL) { |
414 | printk(KERN_INFO PFX "Detected a ULi chipset, " | 414 | printk(KERN_INFO PFX "Detected a ULi chipset, " |
415 | "but could not fine the secondary device.\n"); | 415 | "but could not fine the secondary device.\n"); |
@@ -442,6 +442,8 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) | |||
442 | enuscr= httfea+ (size * 1024 * 1024) - 1; | 442 | enuscr= httfea+ (size * 1024 * 1024) - 1; |
443 | pci_write_config_dword(dev1, ULI_X86_64_HTT_FEA_REG, httfea); | 443 | pci_write_config_dword(dev1, ULI_X86_64_HTT_FEA_REG, httfea); |
444 | pci_write_config_dword(dev1, ULI_X86_64_ENU_SCR_REG, enuscr); | 444 | pci_write_config_dword(dev1, ULI_X86_64_ENU_SCR_REG, enuscr); |
445 | |||
446 | pci_dev_put(dev1); | ||
445 | return 0; | 447 | return 0; |
446 | } | 448 | } |
447 | 449 | ||
@@ -466,7 +468,7 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev) | |||
466 | 468 | ||
467 | printk(KERN_INFO PFX "Setting up Nforce3 AGP.\n"); | 469 | printk(KERN_INFO PFX "Setting up Nforce3 AGP.\n"); |
468 | 470 | ||
469 | dev1 = pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(11, 0)); | 471 | dev1 = pci_get_slot(pdev->bus, PCI_DEVFN(11, 0)); |
470 | if (dev1 == NULL) { | 472 | if (dev1 == NULL) { |
471 | printk(KERN_INFO PFX "agpgart: Detected an NVIDIA " | 473 | printk(KERN_INFO PFX "agpgart: Detected an NVIDIA " |
472 | "nForce3 chipset, but could not find " | 474 | "nForce3 chipset, but could not find " |
@@ -510,6 +512,8 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev) | |||
510 | pci_write_config_dword(dev1, NVIDIA_X86_64_1_APBASE2, apbase); | 512 | pci_write_config_dword(dev1, NVIDIA_X86_64_1_APBASE2, apbase); |
511 | pci_write_config_dword(dev1, NVIDIA_X86_64_1_APLIMIT2, aplimit); | 513 | pci_write_config_dword(dev1, NVIDIA_X86_64_1_APLIMIT2, aplimit); |
512 | 514 | ||
515 | pci_dev_put(dev1); | ||
516 | |||
513 | return 0; | 517 | return 0; |
514 | } | 518 | } |
515 | 519 | ||