2008-06-04 22:15:31

by Bjorn Helgaas

[permalink] [raw]
Subject: [patch 11/18] 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 <[email protected]>
Acked-by: Rene Herman <[email protected]>

Index: work10/drivers/pnp/manager.c
===================================================================
--- work10.orig/drivers/pnp/manager.c 2008-05-13 13:29:57.000000000 -0600
+++ work10/drivers/pnp/manager.c 2008-05-13 13:30:21.000000000 -0600
@@ -231,9 +231,6 @@ static int pnp_assign_resources(struct p
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);

--