[-mm patch] the overdue removal of pci_module_init()

[-mm patch] the overdue removal of pci_module_init()

[Adrian Bunk]

Unless we finally completely remove it, people will always add new users.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch obsoletes mark-pci_module_init-deprecated.patch in -mm.

 Documentation/feature-removal-schedule.txt |    7 -------
 Documentation/pci.txt                      |    2 --
 include/linux/pci.h                        |    6 ------
 3 files changed, 15 deletions(-)

--- linux-2.6.21-rc5-mm4/Documentation/feature-removal-schedule.txt.old	2007-04-05 20:47:53.000000000 +0200
+++ linux-2.6.21-rc5-mm4/Documentation/feature-removal-schedule.txt	2007-04-05 20:48:03.000000000 +0200
@@ -104,13 +104,6 @@
 
 ---------------------------
 
-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
--- linux-2.6.21-rc5-mm4/Documentation/pci.txt.old	2007-04-05 20:48:16.000000000 +0200
+++ linux-2.6.21-rc5-mm4/Documentation/pci.txt	2007-04-05 20:48:25.000000000 +0200
@@ -545,8 +545,6 @@
 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
--- linux-2.6.21-rc5-mm4/include/linux/pci.h.old	2007-04-05 20:48:37.000000000 +0200
+++ linux-2.6.21-rc5-mm4/include/linux/pci.h	2007-04-05 20:48:43.000000000 +0200
@@ -410,12 +410,6 @@
 	.vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
 	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
 
-/*
- * pci_module_init is obsolete, this stays here till we fix up all usages of it
- * in the tree.
- */
-#define pci_module_init	pci_register_driver
-
 /**
  * PCI_VDEVICE - macro used to describe a specific pci device in short form
  * @vend: the vendor name

Re: PCI: the overdue removal of pci_module_init()

[Richard Knutsson]

Adrian Bunk wrote:
> Unless we finally completely remove it, people will always add new users.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
>
>   
If this is really it, then ACK!
> ---
>  Documentation/feature-removal-schedule.txt |    7 -------
>  Documentation/pci.txt                      |    2 --
>  include/linux/pci.h                        |    6 ------
>  3 files changed, 15 deletions(-)
>
> --- a/Documentation/feature-removal-schedule.txt
> +++ b/Documentation/feature-removal-schedule.txt
> @@ -105,13 +105,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
> --- a/Documentation/pci.txt
> +++ b/Documentation/pci.txt
> @@ -545,8 +545,6 @@ pci_find_slot()			Find pci_dev correspon
>  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
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -405,12 +405,6 @@ struct pci_driver {
>  	.vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
>  	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
>  
> -/*
> - * pci_module_init is obsolete, this stays here till we fix up all usages of it
> - * in the tree.
> - */
> -#define pci_module_init	pci_register_driver
> -
>  /**
>   * PCI_VDEVICE - macro used to describe a specific pci device in short form
>   * @vend: the vendor name
>
>
> Patches currently in gregkh-2.6 which might be from bunk@stusta.de are
>
> bad/sysfs-crash-debugging.patch
> driver/the-overdue-removal-of-the-mount-umount-uevents.patch
> pci/pci-fix-multiple-definition-of-queue_pushbutton_work.patch
> pci/pci-remove-the-broken-pci_multithread_probe-option.patch
> pci/pci-define-pci_request-release_regions-for-config_pci-n.patch
> pci/pci-the-overdue-removal-of-pci_module_init.patch
> usb/usb-gtco.c-fix-a-use-before-check.patch
> usb/usb-iowarrior.c-fix-null-dereference.patch
>