]> err.no Git - linux-2.6/commitdiff
PNP: remove redundant pnp_can_configure() check
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Fri, 27 Jun 2008 22:57:10 +0000 (16:57 -0600)
committerAndi Kleen <andi@basil.nowhere.org>
Wed, 16 Jul 2008 21:27:07 +0000 (23:27 +0200)
pnp_assign_resources() is static and the only caller checks
pnp_can_configure() before calling it, so no need to do it
again.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/pnp/manager.c

index 1adc83fdabb69497780f09d2dfeaa415a5d76e90..7ea9e1e28003f110bc6e86145be9e7a6de9bf2bf 100644 (file)
@@ -231,9 +231,6 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
        struct pnp_dma *dma;
        int nport = 0, nmem = 0, nirq = 0, ndma = 0;
 
-       if (!pnp_can_configure(dev))
-               return -ENODEV;
-
        dbg_pnp_show_resources(dev, "before pnp_assign_resources");
        mutex_lock(&pnp_res_mutex);
        pnp_clean_resource_table(dev);