Merge tag 'v2.6.39-rc7'

in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.

12 files changed, 99 insertions, 52 deletions

diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile
index 8de3775ec242..bfba893cb321 100644
--- a/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@ -2,11 +2,13 @@
 # Makefile for the Linux Plug-and-Play Support.
 #
 
-obj-y           := core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o
+obj-y           := pnp.o
+
+pnp-y           := core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o
 
 obj-$(CONFIG_PNPACPI)           += pnpacpi/
 obj-$(CONFIG_PNPBIOS)           += pnpbios/
 obj-$(CONFIG_ISAPNP)            += isapnp/
 
 # pnp_system_init goes after pnpacpi/pnpbios init
-obj-y                           += system.o
+pnp-y                           += system.o
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 19bc73695475..fa4e0a5db3f8 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -142,7 +142,9 @@ void __pnp_remove_device(struct pnp_dev *dev);
 int pnp_check_port(struct pnp_dev *dev, struct resource *res);
 int pnp_check_mem(struct pnp_dev *dev, struct resource *res);
 int pnp_check_irq(struct pnp_dev *dev, struct resource *res);
+#ifdef CONFIG_ISA_DMA_API
 int pnp_check_dma(struct pnp_dev *dev, struct resource *res);
+#endif
 
 char *pnp_resource_type_name(struct resource *res);
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 4a651f69e17c..bc00693d0c79 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -320,7 +320,7 @@ void pnp_remove_card_device(struct pnp_dev *dev)
  * pnp_request_card_device - Searches for a PnP device under the specified card
  * @clink: pointer to the card link, cannot be NULL
  * @id: pointer to a PnP ID structure that explains the rules for finding the device
- * @from: Starting place to search from. If NULL it will start from the begining.
+ * @from: Starting place to search from. If NULL it will start from the beginning.
  */
 struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
                                         const char *id, struct pnp_dev *from)
@@ -369,7 +369,7 @@ err_out:
 
 /**
  * pnp_release_card_device - call this when the driver no longer needs the device
- * @dev: pointer to the PnP device stucture
+ * @dev: pointer to the PnP device structure
  */
 void pnp_release_card_device(struct pnp_dev *dev)
 {
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 0f34d962fd3c..cb6ce42f8e77 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -220,10 +220,5 @@ subsys_initcall(pnp_init);
 int pnp_debug;
 
 #if defined(CONFIG_PNP_DEBUG_MESSAGES)
-static int __init pnp_debug_setup(char *__unused)
-{
-        pnp_debug = 1;
-        return 1;
-}
-__setup("pnp.debug", pnp_debug_setup);
+module_param_named(debug, pnp_debug, int, 0644);
 #endif
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d1dbb9df53fa..00e94032531a 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -189,8 +189,11 @@ static int pnp_bus_resume(struct device *dev)
         if (!pnp_drv)
                 return 0;
 
-        if (pnp_dev->protocol->resume)
-                pnp_dev->protocol->resume(pnp_dev);
+        if (pnp_dev->protocol->resume) {
+                error = pnp_dev->protocol->resume(pnp_dev);
+                if (error)
+                        return error;
+        }
 
         if (pnp_can_write(pnp_dev)) {
                 error = pnp_start_dev(pnp_dev);
diff --git a/drivers/pnp/isapnp/Makefile b/drivers/pnp/isapnp/Makefile
index cac18bbfb817..6e607aa33aa3 100644
--- a/drivers/pnp/isapnp/Makefile
+++ b/drivers/pnp/isapnp/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the kernel ISAPNP driver.
 #
+obj-y                   += pnp.o
+pnp-y                   := core.o compat.o
 
-isapnp-proc-$(CONFIG_PROC_FS) = proc.o
-
-obj-y := core.o compat.o $(isapnp-proc-y)
+pnp-$(CONFIG_PROC_FS)   += proc.o
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 0a15664eef1c..ed9ce507149a 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -171,6 +171,7 @@ __add:
         return 0;
 }
 
+#ifdef CONFIG_ISA_DMA_API
 static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
         struct resource *res, local_res;
@@ -210,6 +211,7 @@ __add:
         pnp_add_dma_resource(dev, res->start, res->flags);
         return 0;
 }
+#endif /* CONFIG_ISA_DMA_API */
 
 void pnp_init_resources(struct pnp_dev *dev)
 {
@@ -234,7 +236,8 @@ static void pnp_clean_resource_table(struct pnp_dev *dev)
 static int pnp_assign_resources(struct pnp_dev *dev, int set)
 {
         struct pnp_option *option;
-        int nport = 0, nmem = 0, nirq = 0, ndma = 0;
+        int nport = 0, nmem = 0, nirq = 0;
+        int ndma __maybe_unused = 0;
         int ret = 0;
 
         pnp_dbg(&dev->dev, "pnp_assign_resources, try dependent set %d\n", set);
@@ -256,9 +259,11 @@ static int pnp_assign_resources(struct pnp_dev *dev, int set)
                 case IORESOURCE_IRQ:
                         ret = pnp_assign_irq(dev, &option->u.irq, nirq++);
                         break;
+#ifdef CONFIG_ISA_DMA_API
                 case IORESOURCE_DMA:
                         ret = pnp_assign_dma(dev, &option->u.dma, ndma++);
                         break;
+#endif
                 default:
                         ret = -EINVAL;
                         break;
diff --git a/drivers/pnp/pnpacpi/Makefile b/drivers/pnp/pnpacpi/Makefile
index 905326fcca85..40c93da18252 100644
--- a/drivers/pnp/pnpacpi/Makefile
+++ b/drivers/pnp/pnpacpi/Makefile
@@ -1,5 +1,6 @@
 #
 # Makefile for the kernel PNPACPI driver.
 #
+obj-y += pnp.o
 
-obj-y := core.o rsparser.o
+pnp-y := core.o rsparser.o
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 2d73dfcecdbb..ca84d5099ce7 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -81,12 +81,19 @@ static int pnpacpi_get_resources(struct pnp_dev *dev)
 
 static int pnpacpi_set_resources(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
         struct acpi_buffer buffer;
         int ret;
 
         pnp_dbg(&dev->dev, "set resources\n");
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return -ENODEV;
+        }
+
         ret = pnpacpi_build_resource_template(dev, &buffer);
         if (ret)
                 return ret;
@@ -105,12 +112,18 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
 
 static int pnpacpi_disable_resources(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
         int ret;
 
         dev_dbg(&dev->dev, "disable resources\n");
 
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return 0;
+        }
+
         /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
         ret = 0;
         if (acpi_bus_power_manageable(handle))
@@ -124,46 +137,74 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
 #ifdef CONFIG_ACPI_SLEEP
 static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return false;
+        }
 
         return acpi_bus_can_wakeup(handle);
 }
 
 static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
-        int power_state;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
+        int error = 0;
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return 0;
+        }
 
         if (device_can_wakeup(&dev->dev)) {
-                int rc = acpi_pm_device_sleep_wake(&dev->dev,
+                error = acpi_pm_device_sleep_wake(&dev->dev,
                                 device_may_wakeup(&dev->dev));
+                if (error)
+                        return error;
+        }
+
+        if (acpi_bus_power_manageable(handle)) {
+                int power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
+
+                if (power_state < 0)
+                        power_state = (state.event == PM_EVENT_ON) ?
+                                        ACPI_STATE_D0 : ACPI_STATE_D3;
 
-                if (rc)
-                        return rc;
+                /*
+                 * acpi_bus_set_power() often fails (keyboard port can't be
+                 * powered-down?), and in any case, our return value is ignored
+                 * by pnp_bus_suspend().  Hence we don't revert the wakeup
+                 * setting if the set_power fails.
+                 */
+                error = acpi_bus_set_power(handle, power_state);
         }
-        power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
-        if (power_state < 0)
-                power_state = (state.event == PM_EVENT_ON) ?
-                                ACPI_STATE_D0 : ACPI_STATE_D3;
-
-        /* acpi_bus_set_power() often fails (keyboard port can't be
-         * powered-down?), and in any case, our return value is ignored
-         * by pnp_bus_suspend().  Hence we don't revert the wakeup
-         * setting if the set_power fails.
-         */
-        return acpi_bus_set_power(handle, power_state);
+
+        return error;
 }
 
 static int pnpacpi_resume(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        int error = 0;
+
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return -ENODEV;
+        }
 
         if (device_may_wakeup(&dev->dev))
                 acpi_pm_device_sleep_wake(&dev->dev, false);
-        return acpi_bus_set_power(handle, ACPI_STATE_D0);
+
+        if (acpi_bus_power_manageable(handle))
+                error = acpi_bus_set_power(handle, ACPI_STATE_D0);
+
+        return error;
 }
 #endif
 
@@ -180,7 +221,7 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
-static char *pnpacpi_get_id(struct acpi_device *device)
+static char *__init pnpacpi_get_id(struct acpi_device *device)
 {
         struct acpi_hardware_id *id;
 
diff --git a/drivers/pnp/pnpbios/Makefile b/drivers/pnp/pnpbios/Makefile
index 3cd3ed760605..240b0ffb83ca 100644
--- a/drivers/pnp/pnpbios/Makefile
+++ b/drivers/pnp/pnpbios/Makefile
@@ -1,7 +1,8 @@
 #
 # Makefile for the kernel PNPBIOS driver.
 #
+obj-y := pnp.o
 
-pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o
+pnp-y := core.o bioscalls.o rsparser.o
 
-obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y)
+pnp-$(CONFIG_PNPBIOS_PROC_FS) += proc.o
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
index 8591f6ab1b35..b859d16cf78c 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
@@ -219,7 +219,7 @@ void pnpbios_print_status(const char *module, u16 status)
                        module);
                 break;
         case PNP_HARDWARE_ERROR:
-                printk(KERN_ERR "PnPBIOS: %s: a hardware failure has occured\n",
+                printk(KERN_ERR "PnPBIOS: %s: a hardware failure has occurred\n",
                        module);
                 break;
         default:
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index a925e6b63d72..b0ecacbe53b1 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -409,9 +409,9 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
         return 1;
 }
 
+#ifdef CONFIG_ISA_DMA_API
 int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 {
-#ifndef CONFIG_IA64
         int i;
         struct pnp_dev *tdev;
         struct resource *tres;
@@ -466,11 +466,8 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
         }
 
         return 1;
-#else
-        /* IA64 does not have legacy DMA */
-        return 0;
-#endif
 }
+#endif /* CONFIG_ISA_DMA_API */
 
 unsigned long pnp_resource_type(struct resource *res)
 {