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, 2 insertions, 25 deletions

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 3bda513a6bd3..0826287eef53 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -21,9 +21,6 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
         resource_size_t *start, *end;
         unsigned long *flags;
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_PORT) {
                 pnp_err
                     ("More than 4 ports is incompatible with pnp specifications.");
@@ -66,9 +63,6 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
         resource_size_t *start, *end;
         unsigned long *flags;
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_MEM) {
                 pnp_err
                     ("More than 8 mems is incompatible with pnp specifications.");
@@ -127,9 +121,6 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                 5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
         };
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_IRQ) {
                 pnp_err
                     ("More than 2 irqs is incompatible with pnp specifications.");
@@ -181,9 +172,6 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                 1, 3, 5, 6, 7, 0, 2, 4
         };
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_DMA) {
                 pnp_err
                     ("More than 2 dmas is incompatible with pnp specifications.");
@@ -390,7 +378,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
         up(&pnp_res_mutex);
         return 1;
 
-      fail:
+fail:
         pnp_clean_resource_table(&dev->res);
         up(&pnp_res_mutex);
         return 0;
@@ -410,8 +398,6 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
         int i;
         struct pnp_resource_table *bak;
 
-        if (!dev || !res)
-                return -EINVAL;
         if (!pnp_can_configure(dev))
                 return -ENODEV;
         bak = pnp_alloc(sizeof(struct pnp_resource_table));
@@ -444,7 +430,7 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
         kfree(bak);
         return 0;
 
-      fail:
+fail:
         dev->res = *bak;
         up(&pnp_res_mutex);
         kfree(bak);
@@ -460,9 +446,6 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
         struct pnp_option *dep;
         int i = 1;
 
-        if (!dev)
-                return -EINVAL;
-
         if (!pnp_can_configure(dev)) {
                 pnp_dbg("Device %s does not support resource configuration.",
                         dev->dev.bus_id);
@@ -541,8 +524,6 @@ int pnp_activate_dev(struct pnp_dev *dev)
 {
         int error;
 
-        if (!dev)
-                return -EINVAL;
         if (dev->active)
                 return 0;       /* the device is already active */
 
@@ -568,8 +549,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
 {
         int error;
 
-        if (!dev)
-                return -EINVAL;
         if (!dev->active)
                 return 0;       /* the device is already disabled */
 
@@ -596,8 +575,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
 void pnp_resource_change(struct resource *resource, resource_size_t start,
                          resource_size_t size)
 {
-        if (resource == NULL)
-                return;
         resource->flags &= ~(IORESOURCE_AUTO | IORESOURCE_UNSET);
         resource->start = start;
         resource->end = start + size - 1;