2008-06-17 23:02:36

by Bjorn Helgaas

Subject: [patch 08/28] PNP: remove ratelimit on add resource failures

We used to have a fixed-size resource table. If a device had
twenty resources when the table only had space for ten, we didn't
need ten warnings, so we added the ratelimit.

Now that we can dynamically allocate new resources, we should
only get failures if the allocation fails. That should be
rare enough that we don't need to ratelimit the messages.

Signed-off-by: Bjorn Helgaas <[email protected]>

Index: work10/drivers/pnp/resource.c
===================================================================
--- work10.orig/drivers/pnp/resource.c 2008-05-05 11:38:16.000000000 -0600
+++ work10/drivers/pnp/resource.c 2008-05-05 11:49:05.000000000 -0600
@@ -537,15 +537,10 @@ struct pnp_resource *pnp_add_irq_resourc
{
struct pnp_resource *pnp_res;
struct resource *res;
- static unsigned char warned;

pnp_res = pnp_new_resource(dev);
if (!pnp_res) {
- if (!warned) {
- dev_err(&dev->dev, "can't add resource for IRQ %d\n",
- irq);
- warned = 1;
- }
+ dev_err(&dev->dev, "can't add resource for IRQ %d\n", irq);
return NULL;
}

@@ -563,15 +558,10 @@ struct pnp_resource *pnp_add_dma_resourc
{
struct pnp_resource *pnp_res;
struct resource *res;
- static unsigned char warned;

pnp_res = pnp_new_resource(dev);
if (!pnp_res) {
- if (!warned) {
- dev_err(&dev->dev, "can't add resource for DMA %d\n",
- dma);
- warned = 1;
- }
+ dev_err(&dev->dev, "can't add resource for DMA %d\n", dma);
return NULL;
}

@@ -590,16 +580,12 @@ struct pnp_resource *pnp_add_io_resource
{
struct pnp_resource *pnp_res;
struct resource *res;
- static unsigned char warned;

pnp_res = pnp_new_resource(dev);
if (!pnp_res) {
- if (!warned) {
- dev_err(&dev->dev, "can't add resource for IO "
- "%#llx-%#llx\n",(unsigned long long) start,
- (unsigned long long) end);
- warned = 1;
- }
+ dev_err(&dev->dev, "can't add resource for IO %#llx-%#llx\n",
+ (unsigned long long) start,
+ (unsigned long long) end);
return NULL;
}

@@ -619,16 +605,12 @@ struct pnp_resource *pnp_add_mem_resourc
{
struct pnp_resource *pnp_res;
struct resource *res;
- static unsigned char warned;

pnp_res = pnp_new_resource(dev);
if (!pnp_res) {
- if (!warned) {
- dev_err(&dev->dev, "can't add resource for MEM "
- "%#llx-%#llx\n",(unsigned long long) start,
- (unsigned long long) end);
- warned = 1;
- }
+ dev_err(&dev->dev, "can't add resource for MEM %#llx-%#llx\n",
+ (unsigned long long) start,
+ (unsigned long long) end);
return NULL;
}


--