spi: Remove HOTPLUG section attributes

[linux-2.6-block.git] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 6e7a805d324d19d6bec848a8bca2f2a74a4303af..4dd7b7ce5c5a99d44f50cb6f7a351aa2bc611c1a 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -516,7 +516,7 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
 
        /* Disable Clock */
        if (sdd->port_conf->clk_from_cmu) {
-               clk_disable(sdd->src_clk);
+               clk_disable_unprepare(sdd->src_clk);
        } else {
                val = readl(regs + S3C64XX_SPI_CLK_CFG);
                val &= ~S3C64XX_SPI_ENCLK_ENABLE;
@@ -564,7 +564,7 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
                /* There is half-multiplier before the SPI */
                clk_set_rate(sdd->src_clk, sdd->cur_speed * 2);
                /* Enable Clock */
-               clk_enable(sdd->src_clk);
+               clk_prepare_enable(sdd->src_clk);
        } else {
                /* Configure Clock */
                val = readl(regs + S3C64XX_SPI_CLK_CFG);
@@ -1056,7 +1056,7 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd, int channel)
        flush_fifo(sdd);
 }
 
-static int __devinit s3c64xx_spi_get_dmares(
+static int s3c64xx_spi_get_dmares(
                        struct s3c64xx_spi_driver_data *sdd, bool tx)
 {
        struct platform_device *pdev = sdd->pdev;
@@ -1112,7 +1112,7 @@ static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)
                        dev_err(dev, "invalid gpio[%d]: %d\n", idx, gpio);
                        goto free_gpio;
                }
-
+               sdd->gpios[idx] = gpio;
                ret = gpio_request(gpio, "spi-bus");
                if (ret) {
                        dev_err(dev, "gpio [%d] request failed: %d\n",
@@ -1135,7 +1135,7 @@ static void s3c64xx_spi_dt_gpio_free(struct s3c64xx_spi_driver_data *sdd)
                gpio_free(sdd->gpios[idx]);
 }
 
-static struct __devinit s3c64xx_spi_info * s3c64xx_spi_parse_dt(
+static struct s3c64xx_spi_info * s3c64xx_spi_parse_dt(
                                                struct device *dev)
 {
        struct s3c64xx_spi_info *sci;
@@ -1302,7 +1302,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
                goto err3;
        }
 
-       if (clk_enable(sdd->clk)) {
+       if (clk_prepare_enable(sdd->clk)) {
                dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");
                ret = -EBUSY;
                goto err4;
@@ -1317,7 +1317,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
                goto err5;
        }
 
-       if (clk_enable(sdd->src_clk)) {
+       if (clk_prepare_enable(sdd->src_clk)) {
                dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);
                ret = -EBUSY;
                goto err6;
@@ -1361,11 +1361,11 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
 err8:
        free_irq(irq, sdd);
 err7:
-       clk_disable(sdd->src_clk);
+       clk_disable_unprepare(sdd->src_clk);
 err6:
        clk_put(sdd->src_clk);
 err5:
-       clk_disable(sdd->clk);
+       clk_disable_unprepare(sdd->clk);
 err4:
        clk_put(sdd->clk);
 err3:
@@ -1393,10 +1393,10 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 
        free_irq(platform_get_irq(pdev, 0), sdd);
 
-       clk_disable(sdd->src_clk);
+       clk_disable_unprepare(sdd->src_clk);
        clk_put(sdd->src_clk);
 
-       clk_disable(sdd->clk);
+       clk_disable_unprepare(sdd->clk);
        clk_put(sdd->clk);
 
        if (!sdd->cntrlr_info->cfg_gpio && pdev->dev.of_node)
@@ -1417,8 +1417,8 @@ static int s3c64xx_spi_suspend(struct device *dev)
        spi_master_suspend(master);
 
        /* Disable the clock */
-       clk_disable(sdd->src_clk);
-       clk_disable(sdd->clk);
+       clk_disable_unprepare(sdd->src_clk);
+       clk_disable_unprepare(sdd->clk);
 
        if (!sdd->cntrlr_info->cfg_gpio && dev->of_node)
                s3c64xx_spi_dt_gpio_free(sdd);
@@ -1440,8 +1440,8 @@ static int s3c64xx_spi_resume(struct device *dev)
                sci->cfg_gpio();
 
        /* Enable the clock */
-       clk_enable(sdd->src_clk);
-       clk_enable(sdd->clk);
+       clk_prepare_enable(sdd->src_clk);
+       clk_prepare_enable(sdd->clk);
 
        s3c64xx_spi_hwinit(sdd, sdd->port_id);
 
@@ -1457,8 +1457,8 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
        struct spi_master *master = dev_get_drvdata(dev);
        struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
-       clk_disable(sdd->clk);
-       clk_disable(sdd->src_clk);
+       clk_disable_unprepare(sdd->clk);
+       clk_disable_unprepare(sdd->src_clk);
 
        return 0;
 }
@@ -1468,8 +1468,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
        struct spi_master *master = dev_get_drvdata(dev);
        struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
-       clk_enable(sdd->src_clk);
-       clk_enable(sdd->clk);
+       clk_prepare_enable(sdd->src_clk);
+       clk_prepare_enable(sdd->clk);
 
        return 0;
 }