Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S269063AbUJTS4D (ORCPT ); Wed, 20 Oct 2004 14:56:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268995AbUJTSzD (ORCPT ); Wed, 20 Oct 2004 14:55:03 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.105]:4033 "EHLO e5.ny.us.ibm.com") by vger.kernel.org with ESMTP id S269063AbUJTSwY (ORCPT ); Wed, 20 Oct 2004 14:52:24 -0400 Date: Wed, 20 Oct 2004 11:52:14 -0700 From: Hanna Linder To: lkml , kernel-janitors cc: Hanna Linder , greg@kroah.com, davej@codemonkey.org.uk Subject: [RFT 2.6] intel-agp.c: replace pci_find_device with pci_get_device Message-ID: <17420000.1098298334@w-hlinder.beaverton.ibm.com> X-Mailer: Mulberry/2.2.1 (Linux/x86) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1699 Lines: 50 As pci_find_device is going away soon I have converted this file to use pci_get_device instead. I have compile tested it. If anyone has this hardware and could test it that would be great. Hanna Linder IBM Linux Technology Center Signed-off-by: Hanna Linder --- diff -Nrup linux-2.6.9cln/drivers/char/agp/intel-agp.c linux-2.6.9patch2/drivers/char/agp/intel-agp.c --- linux-2.6.9cln/drivers/char/agp/intel-agp.c 2004-10-18 16:35:52.000000000 -0700 +++ linux-2.6.9patch2/drivers/char/agp/intel-agp.c 2004-10-19 16:05:47.000000000 -0700 @@ -1493,7 +1493,7 @@ static int find_i810(u16 device) { struct pci_dev *i810_dev; - i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL, device, NULL); + i810_dev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL); if (!i810_dev) return 0; intel_i810_private.i810_dev = i810_dev; @@ -1504,9 +1504,9 @@ static int find_i830(u16 device) { struct pci_dev *i830_dev; - i830_dev = pci_find_device(PCI_VENDOR_ID_INTEL, device, NULL); + i830_dev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL); if (i830_dev && PCI_FUNC(i830_dev->devfn) != 0) { - i830_dev = pci_find_device(PCI_VENDOR_ID_INTEL, + i830_dev = pci_get_device(PCI_VENDOR_ID_INTEL, device, i830_dev); } @@ -1715,6 +1715,7 @@ static void __devexit agp_intel_remove(s { struct agp_bridge_data *bridge = pci_get_drvdata(pdev); + pci_dev_put(pdev); agp_remove_bridge(bridge); agp_put_bridge(bridge); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/