aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/manager.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-06-27 18:57:10 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 17:27:07 -0400
commitb08395e5038e3337bb85c7246a635a3be6d5a29c (patch)
tree1d99396ff32220362df1eff40563052745472da8 /drivers/pnp/manager.c
parent6e906f0e1c8633ed357a64e9861f1822789bee3d (diff)
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>
Diffstat (limited to 'drivers/pnp/manager.c')
-rw-r--r--drivers/pnp/manager.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 1adc83fdabb6..7ea9e1e28003 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)
231 struct pnp_dma *dma; 231 struct pnp_dma *dma;
232 int nport = 0, nmem = 0, nirq = 0, ndma = 0; 232 int nport = 0, nmem = 0, nirq = 0, ndma = 0;
233 233
234 if (!pnp_can_configure(dev))
235 return -ENODEV;
236
237 dbg_pnp_show_resources(dev, "before pnp_assign_resources"); 234 dbg_pnp_show_resources(dev, "before pnp_assign_resources");
238 mutex_lock(&pnp_res_mutex); 235 mutex_lock(&pnp_res_mutex);
239 pnp_clean_resource_table(dev); 236 pnp_clean_resource_table(dev);