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

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

6 files changed, 3 insertions, 9 deletions

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index bb758978465d..98b763b705d7 100644
--- 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 4cd62f636547..ce538dad526b 100644
--- 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 ba441ad9a007..f73b3004d6d3 100644
--- 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 98ccd231bf00..9452f6740997 100644
--- 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 e7ffcded4e14..5e91858f6f01 100644
--- 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 c8e795ef2e13..94b5faed21e2 100644
--- 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 */ }
 };