From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Fri, 27 Jun 2008 22:57:10 +0000 (-0600)
Subject: PNP: remove redundant pnp_can_configure() check
X-Git-Tag: v2.6.27-rc1~1050^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b08395e5038e3337bb85c7246a635a3be6d5a29c;p=linux-2.6-omap-h63xx.git

PNP: remove redundant pnp_can_configure() check

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>
---

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 1adc83fdabb..7ea9e1e2800 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -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);