fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / misc / ibmasm / module.c

diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 190349f..2f3bddf 100644 (file)
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -56,19 +56,38 @@
 #include "lowlevel.h"
 #include "remote.h"
 
+int ibmasm_debug = 0;
+module_param(ibmasm_debug, int , S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ibmasm_debug, " Set debug mode on or off");
 
-static int __init ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+
+static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-       int result = -ENOMEM;
+       int result;
        struct service_processor *sp;
 
+       if ((result = pci_enable_device(pdev))) {
+               dev_err(&pdev->dev, "Failed to enable PCI device\n");
+               return result;
+       }
+       if ((result = pci_request_regions(pdev, DRIVER_NAME))) {
+               dev_err(&pdev->dev, "Failed to allocate PCI resources\n");
+               goto error_resources;
+       }
+       /* vnc client won't work without bus-mastering */
+       pci_set_master(pdev);
+
        sp = kmalloc(sizeof(struct service_processor), GFP_KERNEL);
        if (sp == NULL) {
                dev_err(&pdev->dev, "Failed to allocate memory\n");
-               return result;
+               result = -ENOMEM;
+               goto error_kmalloc;
        }
        memset(sp, 0, sizeof(struct service_processor));
 
+       spin_lock_init(&sp->lock);
+       INIT_LIST_HEAD(&sp->command_queue);
+
        pci_set_drvdata(pdev, (void *)sp);
        sp->dev = &pdev->dev;
        sp->number = pdev->bus->number;
@@ -94,23 +113,19 @@ static int __init ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_
                goto error_ioremap;
        }
 
-       result = ibmasm_init_remote_queue(sp);
-       if (result) {
-               dev_err(sp->dev, "Failed to initialize remote queue\n");
-               goto error_remote_queue;
-       }
-
-       sp->lock = SPIN_LOCK_UNLOCKED;
-       INIT_LIST_HEAD(&sp->command_queue);
-
-       result = request_irq(sp->irq, ibmasm_interrupt_handler, SA_SHIRQ, sp->devname, (void*)sp);
+       result = request_irq(sp->irq, ibmasm_interrupt_handler, IRQF_SHARED, sp->devname, (void*)sp);
        if (result) {
                dev_err(sp->dev, "Failed to register interrupt handler\n");
                goto error_request_irq;
        }
 
        enable_sp_interrupts(sp->base_address);
-       disable_mouse_interrupts(sp);
+
+       result = ibmasm_init_remote_input_dev(sp);
+       if (result) {
+               dev_err(sp->dev, "Failed to initialize remote queue\n");
+               goto error_send_message;
+       }
 
        result = ibmasm_send_driver_vpd(sp);
        if (result) {
@@ -130,35 +145,48 @@ static int __init ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_
 
 error_send_message:
        disable_sp_interrupts(sp->base_address);
+       ibmasm_free_remote_input_dev(sp);
        free_irq(sp->irq, (void *)sp);
 error_request_irq:
-       ibmasm_free_remote_queue(sp);
-error_remote_queue:
        iounmap(sp->base_address);
 error_ioremap:
        ibmasm_heartbeat_exit(sp);
 error_heartbeat:
        ibmasm_event_buffer_exit(sp);
 error_eventbuffer:
+       pci_set_drvdata(pdev, NULL);
        kfree(sp);
+error_kmalloc:
+        pci_release_regions(pdev);
+error_resources:
+        pci_disable_device(pdev);
 
        return result;
 }
 
-static void __exit ibmasm_remove_one(struct pci_dev *pdev)
+static void __devexit ibmasm_remove_one(struct pci_dev *pdev)
 {
        struct service_processor *sp = (struct service_processor *)pci_get_drvdata(pdev);
 
+       dbg("Unregistering UART\n");
        ibmasm_unregister_uart(sp);
-       ibmasm_send_os_state(sp, SYSTEM_STATE_OS_DOWN);
+       dbg("Sending OS down message\n");
+       if (ibmasm_send_os_state(sp, SYSTEM_STATE_OS_DOWN))
+               err("failed to get repsonse to 'Send OS State' command\n");
+       dbg("Disabling heartbeats\n");
+       ibmasm_heartbeat_exit(sp);
+       dbg("Disabling interrupts\n");
        disable_sp_interrupts(sp->base_address);
-       disable_mouse_interrupts(sp);
+       dbg("Freeing SP irq\n");
        free_irq(sp->irq, (void *)sp);
-       ibmasm_heartbeat_exit(sp);
-       ibmasm_free_remote_queue(sp);
+       dbg("Cleaning up\n");
+       ibmasm_free_remote_input_dev(sp);
        iounmap(sp->base_address);
        ibmasm_event_buffer_exit(sp);
+       pci_set_drvdata(pdev, NULL);
        kfree(sp);
+       pci_release_regions(pdev);
+       pci_disable_device(pdev);
 }
 
 static struct pci_device_id ibmasm_pci_table[] =
@@ -192,10 +220,9 @@ static int __init ibmasm_init(void)
                return result;
        }
        result = pci_register_driver(&ibmasm_driver);
-       if (result <= 0) {
-               pci_unregister_driver(&ibmasm_driver);
+       if (result) {
                ibmasmfs_unregister();
-               return -ENODEV;
+               return result;
        }
        ibmasm_register_panic_notifier();
        info(DRIVER_DESC " version " DRIVER_VERSION " loaded");
@@ -208,3 +235,5 @@ module_exit(ibmasm_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(pci, ibmasm_pci_table);
+