1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 135f7406f4bf..f756481b0fea 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1401,7 +1401,7 @@ static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,
                                 PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL);
 }
 
-static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev)
+static int pch_spi_pd_probe(struct platform_device *plat_dev)
 {
         int ret;
         struct spi_master *master;
@@ -1498,7 +1498,7 @@ err_pci_iomap:
         return ret;
 }
 
-static int __devexit pch_spi_pd_remove(struct platform_device *plat_dev)
+static int pch_spi_pd_remove(struct platform_device *plat_dev)
 {
         struct pch_spi_board_data *board_dat = dev_get_platdata(&plat_dev->dev);
         struct pch_spi_data *data = platform_get_drvdata(plat_dev);
@@ -1619,12 +1619,12 @@ static struct platform_driver pch_spi_pd_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = pch_spi_pd_probe,
-        .remove = __devexit_p(pch_spi_pd_remove),
+        .remove = pch_spi_pd_remove,
         .suspend = pch_spi_pd_suspend,
         .resume = pch_spi_pd_resume
 };
 
-static int __devinit pch_spi_probe(struct pci_dev *pdev,
+static int pch_spi_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *id)
 {
         struct pch_spi_board_data *board_dat;
@@ -1705,7 +1705,7 @@ err_no_mem:
         return retval;
 }
 
-static void __devexit pch_spi_remove(struct pci_dev *pdev)
+static void pch_spi_remove(struct pci_dev *pdev)
 {
         int i;
         struct pch_pd_dev_save *pd_dev_save = pci_get_drvdata(pdev);
@@ -1776,7 +1776,7 @@ static struct pci_driver pch_spi_pcidev_driver = {
         .name = "pch_spi",
         .id_table = pch_spi_pcidev_id,
         .probe = pch_spi_probe,
-        .remove = __devexit_p(pch_spi_remove),
+        .remove = pch_spi_remove,
         .suspend = pch_spi_suspend,
         .resume = pch_spi_resume,
 };