Merge tag 'drm/for-3.13-rc3' of git://anongit.freedesktop.org/tegra/linux into drm...

[cascardo/linux.git] / drivers / spi / spi-sh-hspi.c

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index e488a90..292567a 100644 (file)
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -137,7 +137,7 @@ static void hspi_hw_setup(struct hspi_priv *hspi,
                        rate /= 16;
 
                /* CLKCx calculation */
-               rate /= (((idiv_clk & 0x1F) + 1) * 2) ;
+               rate /= (((idiv_clk & 0x1F) + 1) * 2);
 
                /* save best settings */
                tmp = abs(target_rate - rate);
@@ -303,9 +303,10 @@ static int hspi_probe(struct platform_device *pdev)
        master->setup           = hspi_setup;
        master->cleanup         = hspi_cleanup;
        master->mode_bits       = SPI_CPOL | SPI_CPHA;
+       master->dev.of_node     = pdev->dev.of_node;
        master->auto_runtime_pm = true;
        master->transfer_one_message            = hspi_transfer_one_message;
-       ret = spi_register_master(master);
+       ret = devm_spi_register_master(&pdev->dev, master);
        if (ret < 0) {
                dev_err(&pdev->dev, "spi_register_master error.\n");
                goto error1;
@@ -328,17 +329,23 @@ static int hspi_remove(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
 
        clk_put(hspi->clk);
-       spi_unregister_master(hspi->master);
 
        return 0;
 }
 
+static struct of_device_id hspi_of_match[] = {
+       { .compatible = "renesas,hspi", },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, hspi_of_match);
+
 static struct platform_driver hspi_driver = {
        .probe = hspi_probe,
        .remove = hspi_remove,
        .driver = {
                .name = "sh-hspi",
                .owner = THIS_MODULE,
+               .of_match_table = hspi_of_match,
        },
 };
 module_platform_driver(hspi_driver);