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

Commit c83642d5 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Andi Kleen
Browse files

ACPI: use dev_printk when possible 



Convert printks to use dev_printk().  The most obvious change will
be messages like this:

   -ACPI: PCI Interrupt 0000:00:04.0[A] -> GSI 31 (level, low) -> IRQ 31
   +cciss 0000:00:04.0: PCI INT A -> GSI 31 (level, low) -> IRQ 31

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

drivers/acpi/pci_irq.c

+17 −21
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt) 
		    !strcmp(prt->source, quirk->source) &&

		    strlen(prt->source) >= strlen(quirk->actual_source)) {

			printk(KERN_WARNING PREFIX "firmware reports "

				"%04x:%02x:%02x[%c] connected to %s; "

				"%04x:%02x:%02x PCI INT %c connected to %s; "

				"changing to %s\n",

				entry->id.segment, entry->id.bus,

				entry->id.device, 'A' + entry->pin,
@@ -429,7 +429,7 @@ acpi_pci_irq_derive(struct pci_dev *dev, 
{

	struct pci_dev *bridge = dev;

	int irq = -1;

	u8 bridge_pin = 0;

	u8 bridge_pin = 0, orig_pin = pin;





	if (!dev)
@@ -463,8 +463,8 @@ acpi_pci_irq_derive(struct pci_dev *dev, 
	}



	if (irq < 0) {

		printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n",

			      pci_name(dev));

		dev_warn(&dev->dev, "can't derive routing for PCI INT %c\n",

			 'A' + orig_pin);

		return -1;

	}
@@ -487,6 +487,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 
	int triggering = ACPI_LEVEL_SENSITIVE;

	int polarity = ACPI_ACTIVE_LOW;

	char *link = NULL;

	char link_desc[16];

	int rc;
@@ -503,7 +504,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 
	pin--;



	if (!dev->bus) {

		printk(KERN_ERR PREFIX "Invalid (NULL) 'bus' field\n");

		dev_err(&dev->dev, "invalid (NULL) 'bus' field\n");

		return -ENODEV;

	}
@@ -538,8 +539,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 
	 * driver reported one, then use it. Exit in any case.

	 */

	if (irq < 0) {

		printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI",

		       pci_name(dev), ('A' + pin));

		dev_warn(&dev->dev, "PCI INT %c: no GSI", 'A' + pin);

		/* Interrupt Line values above 0xF are forbidden */

		if (dev->irq > 0 && (dev->irq <= 0xF)) {

			printk(" - using IRQ %d\n", dev->irq);
@@ -554,19 +554,19 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 


	rc = acpi_register_gsi(irq, triggering, polarity);

	if (rc < 0) {

		printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "

		       "to register GSI\n", pci_name(dev), ('A' + pin));

		dev_warn(&dev->dev, "PCI INT %c: failed to register GSI\n",

			 'A' + pin);

		return rc;

	}

	dev->irq = rc;



	printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",

	       pci_name(dev), 'A' + pin);



	if (link)

		printk("Link [%s] -> ", link);

		snprintf(link_desc, sizeof(link_desc), " -> Link[%s]", link);

	else

		link_desc[0] = '\0';



	printk("GSI %u (%s, %s) -> IRQ %d\n", irq,

	dev_info(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",

		 'A' + pin, link_desc, irq,

		 (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",

		 (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
@@ -616,10 +616,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev) 
	 * (e.g. PCI_UNDEFINED_IRQ).

	 */



	printk(KERN_INFO PREFIX "PCI interrupt for device %s disabled\n",

	       pci_name(dev));



	dev_info(&dev->dev, "PCI INT %c disabled\n", 'A' + pin);

	acpi_unregister_gsi(gsi);



	return;

}