Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore

[cascardo/linux.git] / drivers / spi / spi-bfin-sport.c

diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 6555ecd..ac7ffca 100644 (file)
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -755,8 +755,7 @@ bfin_sport_spi_destroy_queue(struct bfin_sport_spi_master_data *drv_data)
        return 0;
 }
 
-static int __devinit
-bfin_sport_spi_probe(struct platform_device *pdev)
+static int bfin_sport_spi_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct bfin5xx_spi_master *platform_info;
@@ -863,8 +862,7 @@ bfin_sport_spi_probe(struct platform_device *pdev)
 }
 
 /* stop hardware and remove the driver */
-static int __devexit
-bfin_sport_spi_remove(struct platform_device *pdev)
+static int bfin_sport_spi_remove(struct platform_device *pdev)
 {
        struct bfin_sport_spi_master_data *drv_data = platform_get_drvdata(pdev);
        int status = 0;
@@ -935,7 +933,7 @@ static struct platform_driver bfin_sport_spi_driver = {
                .owner = THIS_MODULE,
        },
        .probe   = bfin_sport_spi_probe,
-       .remove  = __devexit_p(bfin_sport_spi_remove),
+       .remove  = bfin_sport_spi_remove,
        .suspend = bfin_sport_spi_suspend,
        .resume  = bfin_sport_spi_resume,
 };