[PATCH 5/5] Sonypi: use pci_get_device

[Dmitry Torokhov <dtor_core@ameritech.net>]

===================================================================


ChangeSet@1.1980, 2004-10-21 01:48:41-05:00, dtor_core@ameritech.net
  Sonypi: switch from pci_find_device to pci_get_device.
  
  Signed-off-by: Dmitry Torokhov <dtor@mail.ru>


 sonypi.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


===================================================================



diff -Nru a/drivers/char/sonypi.c b/drivers/char/sonypi.c
--- a/drivers/char/sonypi.c	2004-10-21 01:54:57 -05:00
+++ b/drivers/char/sonypi.c	2004-10-21 01:54:57 -05:00
@@ -750,11 +750,16 @@
 	.shutdown	= sonypi_shutdown,
 };
 
-static int __devinit sonypi_probe(struct pci_dev *pcidev)
+static int __devinit sonypi_probe(void)
 {
 	int i, ret;
 	struct sonypi_ioport_list *ioport_list;
 	struct sonypi_irq_list *irq_list;
+	struct pci_dev *pcidev;
+
+	pcidev = pci_find_device(PCI_VENDOR_ID_INTEL,
+				 PCI_DEVICE_ID_INTEL_82371AB_3,
+				 NULL);
 
 	spin_lock_init(&sonypi_device.queue.s_lock);
 	init_waitqueue_head(&sonypi_device.proc_list);
@@ -881,6 +886,7 @@
 out2:
 	misc_deregister(&sonypi_misc_device);
 out1:
+	pci_dev_put(sonypi_device.dev);
 	return ret;
 }
 
@@ -896,6 +902,7 @@
 	platform_device_unregister(sonypi_device.pdev);
 	free_irq(sonypi_device.irq, sonypi_irq);
 	release_region(sonypi_device.ioport1, sonypi_device.region_size);
+	pci_dev_put(sonypi_device.dev);
 	misc_deregister(&sonypi_misc_device);
 	printk(KERN_INFO "sonypi: removed.\n");
 }
@@ -920,7 +927,6 @@
 
 static int __init sonypi_init_module(void)
 {
-	struct pci_dev *pcidev;
 	int ret;
 
 	if (!dmi_check_system(sonypi_dmi_table))
@@ -930,10 +936,7 @@
 	if (ret)
 		return ret;
 
-	pcidev = pci_find_device(PCI_VENDOR_ID_INTEL,
-				 PCI_DEVICE_ID_INTEL_82371AB_3,
-				 NULL);
-	ret = sonypi_probe(pcidev);
+	ret = sonypi_probe();
 	if (ret)
 		driver_unregister(&sonypi_driver);