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

Commit 982245f0 authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: remove CONFIG_PCI_NAMES 



This patch removes CONFIG_PCI_NAMES.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 74d863ee

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ Who: Pavel Machek <pavel@suse.cz> 


---------------------------



What:	PCI Name Database (CONFIG_PCI_NAMES)

When:	July 2005

Why:	It bloats the kernel unnecessarily, and is handled by userspace better

	(pciutils supports it.)  Will eliminate the need to try to keep the

	pci.ids file in sync with the sf.net database all of the time.

Who:	Greg Kroah-Hartman <gregkh@suse.de>



---------------------------



What:	io_remap_page_range() (macro or function)

When:	September 2005

Why:	Replaced by io_remap_pfn_range() which allows more memory space

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -1813,13 +1813,6 @@ M: hch@infradead.org 
L:	linux-abi-devel@lists.sourceforge.net

S:	Maintained



PCI ID DATABASE

P:	Martin Mares

M:	mj@ucw.cz

L:	pciids-devel@lists.sourceforge.net

W:	http://pciids.sourceforge.net/

S:	Maintained



PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)

P:	Thomas Sailer

M:	sailer@ife.ee.ethz.ch

arch/alpha/kernel/sys_marvel.c

+2 −3
Original line number Diff line number Diff line
@@ -373,12 +373,11 @@ marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
		irq += 0x80;			/* offset for lsi       */



#if 1

		printk("PCI:%d:%d:%d (hose %d) [%s] is using MSI\n",

		printk("PCI:%d:%d:%d (hose %d) is using MSI\n",

		       dev->bus->number, 

		       PCI_SLOT(dev->devfn), 

		       PCI_FUNC(dev->devfn),

		       hose->index,

		       pci_pretty_name (dev));

		       hose->index);

		printk("  %d message(s) from 0x%04x\n", 

		       1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4),

		       msg_dat);

arch/ppc64/kernel/eeh.c

+14 −17
Original line number Diff line number Diff line
@@ -202,10 +202,9 @@ static void pci_addr_cache_print(struct pci_io_addr_cache *cache) 
	while (n) {

		struct pci_io_addr_range *piar;

		piar = rb_entry(n, struct pci_io_addr_range, rb_node);

		printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s %s\n",

		printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s\n",

		       (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt,

		       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev),

		       pci_pretty_name(piar->pcidev));

		       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev));

		cnt++;

		n = rb_next(n);

	}
@@ -260,8 +259,8 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev) 


	dn = pci_device_to_OF_node(dev);

	if (!dn) {

		printk(KERN_WARNING "PCI: no pci dn found for dev=%s %s\n",

			pci_name(dev), pci_pretty_name(dev));

		printk(KERN_WARNING "PCI: no pci dn found for dev=%s\n",

			pci_name(dev));

		return;

	}
@@ -269,8 +268,8 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev) 
	if (!(dn->eeh_mode & EEH_MODE_SUPPORTED) ||

	    dn->eeh_mode & EEH_MODE_NOCHECK) {

#ifdef DEBUG

		printk(KERN_INFO "PCI: skip building address cache for=%s %s\n",

		       pci_name(dev), pci_pretty_name(dev));

		printk(KERN_INFO "PCI: skip building address cache for=%s\n",

		       pci_name(dev));

#endif

		return;

	}
@@ -447,12 +446,12 @@ static void eeh_panic(struct pci_dev *dev, int reset_state) 
	 * in light of potential corruption, we can use it here.

	 */

	if (panic_on_oops)

		panic("EEH: MMIO failure (%d) on device:%s %s\n", reset_state,

		      pci_name(dev), pci_pretty_name(dev));

		panic("EEH: MMIO failure (%d) on device:%s\n", reset_state,

		      pci_name(dev));

	else {

		__get_cpu_var(ignored_failures)++;

		printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s %s\n",

		       reset_state, pci_name(dev), pci_pretty_name(dev));

		printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s\n",

		       reset_state, pci_name(dev));

	}

}
@@ -482,8 +481,8 @@ static void eeh_event_handler(void *dummy) 
			break;



		printk(KERN_INFO "EEH: MMIO failure (%d), notifiying device "

		       "%s %s\n", event->reset_state,

		       pci_name(event->dev), pci_pretty_name(event->dev));

		       "%s\n", event->reset_state,

		       pci_name(event->dev));



		atomic_set(&eeh_fail_count, 0);

		notifier_call_chain (&eeh_notifier_chain,
@@ -851,8 +850,7 @@ void eeh_add_device_late(struct pci_dev *dev) 
		return;



#ifdef DEBUG

	printk(KERN_DEBUG "EEH: adding device %s %s\n", pci_name(dev),

	       pci_pretty_name(dev));

	printk(KERN_DEBUG "EEH: adding device %s\n", pci_name(dev));

#endif



	pci_addr_cache_insert_device (dev);
@@ -873,8 +871,7 @@ void eeh_remove_device(struct pci_dev *dev) 


	/* Unregister the device with the EEH/PCI address search system */

#ifdef DEBUG

	printk(KERN_DEBUG "EEH: remove device %s %s\n", pci_name(dev),

	       pci_pretty_name(dev));

	printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev));

#endif

	pci_addr_cache_remove_device(dev);

}

arch/ppc64/kernel/iSeries_VpdInfo.c

+1 −4
Original line number Diff line number Diff line
@@ -264,8 +264,5 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count) 
	printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, Card %4s  ",

			count, bus, PCI_SLOT(PciDev->devfn), PciDev->vendor,

			frame, card);

	if (pci_class_name(PciDev->class >> 8) == 0)

	printk("0x%04X\n", (int)(PciDev->class >> 8));

	else

		printk("%s\n", pci_class_name(PciDev->class >> 8));

}