[PATCH 33/35 linux-next] mmc: constify of_device_id array
From: Fabian Frederick <hidden>
Date: 2015-03-21 20:09:30
Also in:
linux-mmc, lkml
On 20 March 2015 at 09:56 Ulf Hansson [off-list ref] wrote: On 17 March 2015 at 10:49, Ulf Hansson [off-list ref] wrote:quoted
On 16 March 2015 at 20:59, Fabian Frederick [off-list ref] wrote:quoted
of_device_id is always used as const. (See driver.of_match_table and open firmware functions) Signed-off-by: Fabian Frederick <redacted>Acked-by: Ulf Hansson <redacted>I realized that you might wanted me to pick this up and queue it through my mmc tree? Just tell me if that's what you want. Kind regards Uffe
Hi Ulf, ? ? ? ? Yes of course :) (it has not been added to linux-next yet). Thanks, Fabian
quoted
quoted
--- ? drivers/mmc/host/mmc_spi.c? ?| 2 +- ? drivers/mmc/host/wmt-sdmmc.c | 2 +- ? 2 files changed, 2 insertions(+), 2 deletions(-)diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index e4a0754..ae19d83 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c@@ -1507,7 +1507,7 @@ static int mmc_spi_remove(struct spi_device *spi)? ? ? ? ?return 0; ? } -static struct of_device_id mmc_spi_of_match_table[] = { +static const struct of_device_id mmc_spi_of_match_table[] = { ? ? ? ? ?{ .compatible = "mmc-spi-slot", }, ? ? ? ? ?{}, ? };diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c index dd2e1aa..5af0055 100644 --- a/drivers/mmc/host/wmt-sdmmc.c +++ b/drivers/mmc/host/wmt-sdmmc.c@@ -744,7 +744,7 @@ static struct wmt_mci_caps wm8505_caps = {? ? ? ? ?.max_blk_size = 2048, ? }; -static struct of_device_id wmt_mci_dt_ids[] = { +static const struct of_device_id wmt_mci_dt_ids[] = { ? ? ? ? ?{ .compatible = "wm,wm8505-sdhc", .data = &wm8505_caps }, ? ? ? ? ?{ /* Sentinel */ }, ? }; -- 2.1.0