Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof

Conflicts:
	drivers/spi/spi-sh-msiof.c

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index bb758978465dd1cdcdd2db247c0073515841e48d..98b763b705d7782da331e227de1ab6068595b562 100644 (file)
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -647,7 +647,7 @@ static int __maybe_unused cdns_spi_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(cdns_spi_dev_pm_ops, cdns_spi_suspend,
                         cdns_spi_resume);
 
-static struct of_device_id cdns_spi_of_match[] = {
+static const struct of_device_id cdns_spi_of_match[] = {
        { .compatible = "xlnx,zynq-spi-r1p6" },
        { .compatible = "cdns,spi-r1p6" },
        { /* end of table */ }

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 4cd62f63654741010a70fa7d45a4aae820a87e32..ce538dad526b3a34d08dd5498e803d08b23862e8 100644 (file)
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -184,8 +184,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
        }
        master->max_speed_hz = clk_get_rate(hw->spi_clk);
 
-       platform_set_drvdata(pdev, master);
-
        hw->syscon = syscon_regmap_lookup_by_pdevname("syscon.3");
        if (IS_ERR(hw->syscon)) {
                ret = PTR_ERR(hw->syscon);

diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c
index ba441ad9a007fc374d146d58eee391c836b2b9c4..f73b3004d6d30665ac06a911154e2507d59b57f5 100644 (file)
--- a/drivers/spi/spi-falcon.c
+++ b/drivers/spi/spi-falcon.c
@@ -425,8 +425,6 @@ static int falcon_sflash_probe(struct platform_device *pdev)
        master->unprepare_transfer_hardware = falcon_sflash_unprepare_xfer;
        master->dev.of_node = pdev->dev.of_node;
 
-       platform_set_drvdata(pdev, priv);
-
        ret = devm_spi_register_master(&pdev->dev, master);
        if (ret)
                spi_master_put(master);

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 98ccd231bf009bdb1ac48a10ed8324b6620a3c63..9452f6740997b1970e8645e4cd141010b5389b38 100644 (file)
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -58,7 +58,7 @@ static struct fsl_spi_match_data of_fsl_spi_grlib_config = {
        .type = TYPE_GRLIB,
 };
 
-static struct of_device_id of_fsl_spi_match[] = {
+static const struct of_device_id of_fsl_spi_match[] = {
        {
                .compatible = "fsl,spi",
                .data = &of_fsl_spi_fsl_config,

diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c
index e7ffcded4e14b84d28cef21e0c8f321690d49e94..5e91858f6f01f819dfb0f4191e7f369e6f9bbafe 100644 (file)
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@ -420,8 +420,6 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
        master->min_speed_hz = OMAP1_SPI100K_MAX_FREQ/(1<<16);
        master->max_speed_hz = OMAP1_SPI100K_MAX_FREQ;
 
-       platform_set_drvdata(pdev, master);
-
        spi100k = spi_master_get_devdata(master);
 
        /*

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index c8e795ef2e132fcb10dd4ac196decbd887861f5d..94b5faed21e2c45cfbdc6e06a665645722811054 100644 (file)
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -304,7 +304,7 @@ static int hspi_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct of_device_id hspi_of_match[] = {
+static const struct of_device_id hspi_of_match[] = {
        { .compatible = "renesas,hspi", },
        { /* sentinel */ }
 };