2 files changed, 3 insertions, 23 deletions

diff --git a/Documentation/PCI/pci-iov-howto.txt b/Documentation/PCI/pci-iov-howto.txt
index cfaca7e69893..86551cc72e03 100644
--- a/Documentation/PCI/pci-iov-howto.txt
+++ b/Documentation/PCI/pci-iov-howto.txt
@@ -76,7 +76,7 @@ To notify SR-IOV core of Virtual Function Migration:
 
 Following piece of code illustrates the usage of the SR-IOV API.
 
-static int __devinit dev_probe(struct pci_dev *dev, const struct pci_device_id *id)
+static int dev_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
         pci_enable_sriov(dev, NR_VIRTFN);
 
@@ -85,7 +85,7 @@ static int __devinit dev_probe(struct pci_dev *dev, const struct pci_device_id *
         return 0;
 }
 
-static void __devexit dev_remove(struct pci_dev *dev)
+static void dev_remove(struct pci_dev *dev)
 {
         pci_disable_sriov(dev);
 
@@ -131,7 +131,7 @@ static struct pci_driver dev_driver = {
         .name =         "SR-IOV Physical Function driver",
         .id_table =     dev_id_table,
         .probe =        dev_probe,
-        .remove =       __devexit_p(dev_remove),
+        .remove =       dev_remove,
         .suspend =      dev_suspend,
         .resume =       dev_resume,
         .shutdown =     dev_shutdown,
diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt
index aa09e5476bba..bccf602a87f5 100644
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
@@ -183,12 +183,6 @@ Please mark the initialization and cleanup functions where appropriate
                         initializes.
         __exit          Exit code. Ignored for non-modular drivers.
 
-
-        __devinit       Device initialization code.
-                        Identical to __init if the kernel is not compiled
-                        with CONFIG_HOTPLUG, normal function otherwise.
-        __devexit       The same for __exit.
-
 Tips on when/where to use the above attributes:
         o The module_init()/module_exit() functions (and all
           initialization functions called _only_ from these)
@@ -196,20 +190,6 @@ Tips on when/where to use the above attributes:
 
         o Do not mark the struct pci_driver.
 
-        o The ID table array should be marked __devinitconst; this is done
-          automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE().
-
-        o The probe() and remove() functions should be marked __devinit
-          and __devexit respectively.  All initialization functions
-          exclusively called by the probe() routine, can be marked __devinit.
-          Ditto for remove() and __devexit.
-
-        o If mydriver_remove() is marked with __devexit(), then all address
-          references to mydriver_remove must use __devexit_p(mydriver_remove)
-          (in the struct pci_driver declaration for example).
-          __devexit_p() will generate the function name _or_ NULL if the
-          function will be discarded.  For an example, see drivers/net/tg3.c.
-
         o Do NOT mark a function if you are not sure which mark to use.
           Better to not mark the function than mark the function wrong.