Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (30 commits)
  ACPI: work around duplicate name "VID" problem on T61
  acpiphp_ibm: add missing '\n' to error message
  ACPI: add dump_stack() to trace acpi_format_exception programming errors
  make drivers/acpi/scan.c:create_modalias() static
  ACPI: Fix a warning of discarding qualifiers from pointer target type
  ACPI: "ACPI handle has no context!" should be KERN_DEBUG
  ACPI video hotkey: export missing ACPI video hotkey events via input layer
  ACPI: Validate XSDT, use RSDT if XSDT fails
  ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such
  ACPI: fix ia64 allnoconfig build
  PNP: remove null pointer checks
  PNP: remove MODULE infrastructure
  ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG
  PNPACPI: remove unnecessary casts of "void *"
  PNPACPI: simplify irq_flags()
  PNP: fix up after Lindent
  ACPI: enable GPEs before calling _WAK on resume
  asus-laptop: Fix rmmod of asus_laptop
  sony-laptop: call sonypi_compat_init earlier
  sony-laptop: enable Vaio FZ events
  ...

1 files changed, 0 insertions, 26 deletions

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index ea6ec14a0559..ef1286900db3 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -47,9 +47,6 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
 {
         struct pnp_option *option;
 
-        if (!dev)
-                return NULL;
-
         option = pnp_build_option(PNP_RES_PRIORITY_PREFERRED);
 
         /* this should never happen but if it does we'll try to continue */
@@ -64,9 +61,6 @@ struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
 {
         struct pnp_option *option;
 
-        if (!dev)
-                return NULL;
-
         option = pnp_build_option(priority);
 
         if (dev->dependent) {
@@ -83,11 +77,6 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
 {
         struct pnp_irq *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->irq;
         while (ptr && ptr->next)
                 ptr = ptr->next;
@@ -112,11 +101,6 @@ int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
 {
         struct pnp_dma *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->dma;
         while (ptr && ptr->next)
                 ptr = ptr->next;
@@ -132,11 +116,6 @@ int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
 {
         struct pnp_port *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->port;
         while (ptr && ptr->next)
                 ptr = ptr->next;
@@ -152,11 +131,6 @@ int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
 {
         struct pnp_mem *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->mem;
         while (ptr && ptr->next)
                 ptr = ptr->next;