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

Commit 89661ada authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (59 commits)
  PCI: Free resource files in error path of pci_create_sysfs_dev_files()
  pci-quirks: disable MSI on RS400-200 and RS480
  PCI hotplug: Use menuconfig objects
  PCI: ZT5550 CPCI Hotplug driver fix
  PCI: rpaphp: Remove semaphores
  PCI: rpaphp: Ensure more pcibios_add/pcibios_remove symmetry
  PCI: rpaphp: Use pcibios_remove_pci_devices() symmetrically
  PCI: rpaphp: Document is_php_dn()
  PCI: rpaphp: Document find_php_slot()
  PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot()
  PCI: rpaphp: refactor tail call to rpaphp_register_slot()
  PCI: rpaphp: remove rpaphp_set_attention_status()
  PCI: rpaphp: remove print_slot_pci_funcs()
  PCI: rpaphp: Remove setup_pci_slot()
  PCI: rpaphp: remove a call that does nothing but a pointer lookup
  PCI: rpaphp: Remove another wrappered function
  PCI: rpaphp: Remve another call that is a wrapper
  PCI: rpaphp: remove a function that does nothing but wrap debug printks
  PCI: rpaphp: Remove un-needed goto
  PCI: rpaphp: Fix a memleak; slot->location string was never freed
  ...
parents 6adae5d9 9890b12a

Documentation/feature-removal-schedule.txt

+0 −7
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ Who: Adrian Bunk <bunk@stusta.de> 


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



What:	pci_module_init(driver)

When:	January 2007

Why:	Is replaced by pci_register_driver(pci_driver).

Who:	Richard Knutsson <ricknu-0@student.ltu.se> and Greg Kroah-Hartman <gregkh@suse.de>



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



What:	Usage of invalid timevals in setitimer

When:	March 2007

Why:	POSIX requires to validate timevals in the setitimer call. This

Documentation/pci.txt

+3 −9
Original line number Diff line number Diff line
@@ -124,10 +124,6 @@ initialization with a pointer to a structure describing the driver 


	err_handler	See Documentation/pci-error-recovery.txt



	multithread_probe	Enable multi-threaded probe/scan. Driver must

			provide its own locking/syncronization for init

			operations if this is enabled.





The ID table is an array of struct pci_device_id entries ending with an

all-zero entry.  Each entry consists of:
@@ -163,9 +159,9 @@ echo "vendor device subvendor subdevice class class_mask driver_data" > \ 
/sys/bus/pci/drivers/{driver}/new_id



All fields are passed in as hexadecimal values (no leading 0x).

Users need pass only as many fields as necessary:

	o vendor, device, subvendor, and subdevice fields default

	  to PCI_ANY_ID (FFFFFFFF),

The vendor and device fields are mandatory, the others are optional. Users

need pass only as many optional fields as necessary:

	o subvendor and subdevice fields default to PCI_ANY_ID (FFFFFFFF)

	o class and classmask fields default to 0

	o driver_data defaults to 0UL.
@@ -549,8 +545,6 @@ pci_find_slot() Find pci_dev corresponding to given bus and 
pci_set_power_state()		Set PCI Power Management state (0=D0 ... 3=D3)

pci_find_capability()		Find specified capability in device's capability

				list.

pci_module_init()		Inline helper function for ensuring correct

				pci_driver initialization and error handling.

pci_resource_start()		Returns bus start address for a given PCI region

pci_resource_end()		Returns bus end address for a given PCI region

pci_resource_len()		Returns the byte length of a PCI region

Documentation/power/pci.txt

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ resume 


Usage:



if (dev->driver && dev->driver->suspend)

if (dev->driver && dev->driver->resume)

	dev->driver->resume(dev)



The resume callback may be called from any power state, and is always meant to

arch/alpha/kernel/err_common.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 */



#include <linux/init.h>

#include <linux/pci.h>

#include <linux/sched.h>



#include <asm/io.h>

arch/alpha/kernel/err_ev6.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 */



#include <linux/init.h>

#include <linux/pci.h>

#include <linux/sched.h>



#include <asm/io.h>