spi/pxa2xx: break out the private DMA API usage into a separate file

[~andy/linux] / drivers / spi / spi-sh-hspi.c

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 47c4beee8a0e33fe748ee8211ca4f31b80a10b9b..60cfae51c713818ef630f802db2e2e8c747f98d7 100644 (file)
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -268,7 +268,7 @@ static void hspi_cleanup(struct spi_device *spi)
        dev_dbg(dev, "%s cleanup\n", spi->modalias);
 }
 
-static int __devinit hspi_probe(struct platform_device *pdev)
+static int hspi_probe(struct platform_device *pdev)
 {
        struct resource *res;
        struct spi_master *master;
@@ -290,7 +290,7 @@ static int __devinit hspi_probe(struct platform_device *pdev)
        }
 
        clk = clk_get(NULL, "shyway_clk");
-       if (!clk) {
+       if (IS_ERR(clk)) {
                dev_err(&pdev->dev, "shyway_clk is required\n");
                ret = -EINVAL;
                goto error0;
@@ -339,7 +339,7 @@ static int __devinit hspi_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit hspi_remove(struct platform_device *pdev)
+static int hspi_remove(struct platform_device *pdev)
 {
        struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev);
 
@@ -353,7 +353,7 @@ static int __devexit hspi_remove(struct platform_device *pdev)
 
 static struct platform_driver hspi_driver = {
        .probe = hspi_probe,
-       .remove = __devexit_p(hspi_remove),
+       .remove = hspi_remove,
        .driver = {
                .name = "sh-hspi",
                .owner = THIS_MODULE,