Skip to contentSkip to conversation

Update for "name" out of struct device.

ALPHA Jeff Garzik 2 participants 3 messages Aug 18, 2003 1 message not in the archive Alpha port

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Jeff Garzik

author
#1 lore raw
Quoted 12 lines · Linux Kernel Mailing List
arch/alpha/kernel/sys_marvel.c +7 -0
@@ -33,6 +33,13 @@
+/* ??? Should probably be generic.  */
+#ifdef CONFIG_PCI_NAMES
+#define pci_pretty_name(x) ((x)->pretty_name)
+#else
+#define pci_pretty_name(x) ""
+#endif
+

arch/alpha/kernel/sys_marvel.c line 389

Quoted 6 lines
arch/alpha/kernel/sys_marvel.c +1 -1
@@ -378,7 +385,7 @@
 		       PCI_SLOT(dev->devfn), 
 		       PCI_FUNC(dev->devfn),
 		       hose->index,
-		       dev->dev.name);
+		       pci_pretty_name (dev));
 		printk("  %d message(s) from 0x%04x\n",

hmmm, I think a better fix can be had... We store all that information.

What do you think about the following patch? It follows the style of other PCI core messages, and prints out the same information as before.

This assumes, of course, marvel_map_irq is called after pci_name() is assigned a value...

Jeff

===== arch/alpha/kernel/sys_marvel.c 1.7 vs edited =====

arch/alpha/kernel/sys_marvel.c +1 -13
@@ -33,13 +33,6 @@
 # error NR_IRQS < MARVEL_NR_IRQS !!!
 #endif
 
-/* ??? Should probably be generic.  */
-#ifdef CONFIG_PCI_NAMES
-#define pci_pretty_name(x) ((x)->pretty_name)
-#else
-#define pci_pretty_name(x) ""
-#endif
-
 
 /*
  * Interrupt handling.

@@ -380,12 +373,7 @@
 		irq += 0x80;			/* offset for lsi       */
 
 #if 1
-		printk("PCI:%d:%d:%d (hose %d) [%s] is using MSI\n",
-		       dev->bus->number, 
-		       PCI_SLOT(dev->devfn), 
-		       PCI_FUNC(dev->devfn),
-		       hose->index,
-		       pci_pretty_name (dev));
+		printk("PCI:%s is using MSI\n", pci_name (dev));
 		printk("  %d message(s) from 0x%04x\n", 
 		       1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4),
 		       msg_dat);
author
#2 lore raw
Quoted 2 lines · Jeff Garzik

What do you think about the following patch? It follows the style of other PCI core messages, and prints out the same information as before.

...except for the pretty name, of course.

But IMO we need to stop drivers and core from printing out pretty-name at all, which is another reason for my patch. Having name information like this in the kernel, overall, is a waste, IMO. _Especially_ when that information is conditional. We should be consistent with what we print out, to reduce user confusion.

Jeff

#3 lore raw
Quoted 11 lines · Jeff Garzik
Quoted 2 lines · Jeff Garzik

What do you think about the following patch? It follows the style of other PCI core messages, and prints out the same information as before.

...except for the pretty name, of course.

But IMO we need to stop drivers and core from printing out pretty-name at all, which is another reason for my patch. Having name information like this in the kernel, overall, is a waste, IMO. _Especially_ when that information is conditional. We should be consistent with what we print out, to reduce user confusion.

Hence "pci_name()" :)

greg k-h