Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2663f60d authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNP: remove some uses of DEBUG ifdef 



Use scnprintf() to build up a buffer of PNP IDs to print.  This
makes the printk atomic and helps get rid of an #ifdef.

Also remove an "#ifdef DEBUG" from some debug functions.  The
functions only produce debug output, so it's OK to run the
function and just have the output be dropped at the end.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 668b21de

drivers/pnp/core.c

+8 −10
Original line number Diff line number Diff line
@@ -185,6 +185,9 @@ int __pnp_add_device(struct pnp_dev *dev) 
int pnp_add_device(struct pnp_dev *dev)

{

	int ret;

	char buf[128];

	int len = 0;

	struct pnp_id *id;



	if (dev->card)

		return -EINVAL;
@@ -193,17 +196,12 @@ int pnp_add_device(struct pnp_dev *dev) 
	if (ret)

		return ret;



#ifdef CONFIG_PNP_DEBUG

	{

		struct pnp_id *id;



		dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs",

			dev->protocol->name);

	buf[0] = '\0';

	for (id = dev->id; id; id = id->next)

			printk(" %s", id->id);

		printk(" (%s)\n", dev->active ? "active" : "disabled");

	}

#endif

		len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);



	dev_dbg(&dev->dev, "%s device, IDs%s (%s)\n",

		dev->protocol->name, buf, dev->active ? "active" : "disabled");

	return 0;

}

drivers/pnp/support.c

+0 −4
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ char *pnp_resource_type_name(struct resource *res) 


void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)

{

#ifdef DEBUG

	char buf[128];

	int len;

	struct pnp_resource *pnp_res;
@@ -118,7 +117,6 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) 
		}

		dev_dbg(&dev->dev, "%s\n", buf);

	}

#endif

}



char *pnp_option_priority_name(struct pnp_option *option)
@@ -136,7 +134,6 @@ char *pnp_option_priority_name(struct pnp_option *option) 


void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option)

{

#ifdef DEBUG

	char buf[128];

	int len = 0, i;

	struct pnp_port *port;
@@ -209,5 +206,4 @@ void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option) 
		break;

	}

	dev_dbg(&dev->dev, "%s\n", buf);

#endif

}