Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[mv-sheeva.git] / drivers / acpi / bay.c

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 9fdee610ae05351c7da4ed1bc37bb96b956d6608..fb3f31b5e69f6587ff4c7cada15b2291c64fad40 100644 (file)
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -32,11 +32,9 @@
 #include <asm/uaccess.h>
 #include <linux/platform_device.h>
 
-#define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver"
-
-ACPI_MODULE_NAME("bay")
+ACPI_MODULE_NAME("bay");
 MODULE_AUTHOR("Kristen Carlson Accardi");
-MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME);
+MODULE_DESCRIPTION("ACPI Removable Drive Bay Driver");
 MODULE_LICENSE("GPL");
 #define ACPI_BAY_CLASS "bay"
 #define ACPI_BAY_COMPONENT     0x10000000
@@ -276,14 +274,14 @@ static int bay_add(acpi_handle handle, int id)
        /*
         * Initialize bay device structure
         */
-       new_bay = kzalloc(GFP_ATOMIC, sizeof(*new_bay));
+       new_bay = kzalloc(sizeof(*new_bay), GFP_ATOMIC);
        INIT_LIST_HEAD(&new_bay->list);
        new_bay->handle = handle;
        new_bay->name = (char *)nbuffer.pointer;
 
        /* initialize platform device stuff */
        pdev = platform_device_register_simple(ACPI_BAY_CLASS, id, NULL, 0);
-       if (pdev == NULL) {
+       if (IS_ERR(pdev)) {
                printk(KERN_ERR PREFIX "Error registering bay device\n");
                goto bay_add_err;
        }