9 files changed, 14 insertions, 36 deletions

diff --git a/Documentation/DocBook/media/v4l/driver.xml b/Documentation/DocBook/media/v4l/driver.xml
index eacafe312cd2..7c6638bacedb 100644
--- a/Documentation/DocBook/media/v4l/driver.xml
+++ b/Documentation/DocBook/media/v4l/driver.xml
@@ -116,7 +116,7 @@ my_suspend              (struct pci_dev *               pci_dev,
         return 0; /* a negative value on error, 0 on success. */
 }
 
-static void __devexit
+static void
 my_remove               (struct pci_dev *               pci_dev)
 {
         my_device *my = pci_get_drvdata (pci_dev);
@@ -124,7 +124,7 @@ my_remove               (struct pci_dev *               pci_dev)
         /* Describe me. */
 }
 
-static int __devinit
+static int
 my_probe                (struct pci_dev *               pci_dev,
                          const struct pci_device_id *   pci_id)
 {
@@ -157,7 +157,7 @@ my_pci_driver = {
         .id_table = my_pci_device_ids,
 
         .probe    = my_probe,
-        .remove   = __devexit_p (my_remove),
+        .remove   = my_remove,
 
         /* Power management functions. */
         .suspend  = my_suspend,
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.
 
diff --git a/Documentation/acpi/enumeration.txt b/Documentation/acpi/enumeration.txt
index 4f27785ca0c8..54469bc81b1c 100644
--- a/Documentation/acpi/enumeration.txt
+++ b/Documentation/acpi/enumeration.txt
@@ -185,7 +185,7 @@ input driver:
                         .acpi_match_table  ACPI_PTR(mpu3050_acpi_match),
                 },
                 .probe          = mpu3050_probe,
-                .remove         = __devexit_p(mpu3050_remove),
+                .remove         = mpu3050_remove,
                 .id_table       = mpu3050_ids,
         };
 
diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices
index abf63615ee05..22182660dda7 100644
--- a/Documentation/i2c/instantiating-devices
+++ b/Documentation/i2c/instantiating-devices
@@ -91,7 +91,7 @@ Example (from the nxp OHCI driver):
 
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
-static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
+static int usb_hcd_nxp_probe(struct platform_device *pdev)
 {
         (...)
         struct i2c_adapter *i2c_adap;
diff --git a/Documentation/rpmsg.txt b/Documentation/rpmsg.txt
index 409d9f964c5b..f7edc3aa1e92 100644
--- a/Documentation/rpmsg.txt
+++ b/Documentation/rpmsg.txt
@@ -236,7 +236,7 @@ static int rpmsg_sample_probe(struct rpmsg_channel *rpdev)
         return 0;
 }
 
-static void __devexit rpmsg_sample_remove(struct rpmsg_channel *rpdev)
+static void rpmsg_sample_remove(struct rpmsg_channel *rpdev)
 {
         dev_info(&rpdev->dev, "rpmsg sample client driver is removed\n");
 }
@@ -253,7 +253,7 @@ static struct rpmsg_driver rpmsg_sample_client = {
         .id_table       = rpmsg_driver_sample_id_table,
         .probe          = rpmsg_sample_probe,
         .callback       = rpmsg_sample_cb,
-        .remove         = __devexit_p(rpmsg_sample_remove),
+        .remove         = rpmsg_sample_remove,
 };
 
 static int __init init(void)
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary
index 7312ec14dd89..2331eb214146 100644
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
@@ -345,7 +345,7 @@ SPI protocol drivers somewhat resemble platform device drivers:
                 },
 
                 .probe          = CHIP_probe,
-                .remove         = __devexit_p(CHIP_remove),
+                .remove         = CHIP_remove,
                 .suspend        = CHIP_suspend,
                 .resume         = CHIP_resume,
         };
@@ -355,7 +355,7 @@ device whose board_info gave a modalias of "CHIP".  Your probe() code
 might look like this unless you're creating a device which is managing
 a bus (appearing under /sys/class/spi_master).
 
-        static int __devinit CHIP_probe(struct spi_device *spi)
+        static int CHIP_probe(struct spi_device *spi)
         {
                 struct CHIP                     *chip;
                 struct CHIP_platform_data       *pdata;
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index 32bfe926e8d7..b89567ad04b7 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -174,8 +174,7 @@ The recommended approach is as follows:
 
 static atomic_t drv_instance = ATOMIC_INIT(0);
 
-static int __devinit drv_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *pci_id)
+static int drv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 {
         ...
         state->instance = atomic_inc_return(&drv_instance) - 1;
diff --git a/Documentation/zh_CN/video4linux/v4l2-framework.txt b/Documentation/zh_CN/video4linux/v4l2-framework.txt
index 3e74f13af426..44c1d934c4e3 100644
--- a/Documentation/zh_CN/video4linux/v4l2-framework.txt
+++ b/Documentation/zh_CN/video4linux/v4l2-framework.txt
@@ -182,8 +182,7 @@ int iterate(void *p)
 
 static atomic_t drv_instance = ATOMIC_INIT(0);
 
-static int __devinit drv_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *pci_id)
+static int drv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 {
         ...
         state->instance = atomic_inc_return(&drv_instance) - 1;