Re: [PATCH 21/35 linux-next] mfd: constify of_device_id array

From: Lee Jones
Date: Mon Mar 23 2015 - 08:29:35 EST


On Mon, 16 Mar 2015, Fabian Frederick wrote:

> of_device_id is always used as const.
> (See driver.of_match_table and open firmware functions)
>
> Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
> ---
> drivers/mfd/hi6421-pmic-core.c | 2 +-
> drivers/mfd/rk808.c | 2 +-
> drivers/mfd/twl4030-power.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c
> index 7210ae2..95b2ff8 100644
> --- a/drivers/mfd/hi6421-pmic-core.c
> +++ b/drivers/mfd/hi6421-pmic-core.c
> @@ -93,7 +93,7 @@ static int hi6421_pmic_remove(struct platform_device *pdev)
> return 0;
> }
>
> -static struct of_device_id of_hi6421_pmic_match_tbl[] = {
> +static const struct of_device_id of_hi6421_pmic_match_tbl[] = {
> { .compatible = "hisilicon,hi6421-pmic", },
> { },
> };
> diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> index 7cf25c7..4b1e439 100644
> --- a/drivers/mfd/rk808.c
> +++ b/drivers/mfd/rk808.c
> @@ -246,7 +246,7 @@ static int rk808_remove(struct i2c_client *client)
> return 0;
> }
>
> -static struct of_device_id rk808_of_match[] = {
> +static const struct of_device_id rk808_of_match[] = {
> { .compatible = "rockchip,rk808" },
> { },
> };
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 3935092..f440aed 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -829,7 +829,7 @@ static struct twl4030_power_data osc_off_idle = {
> .board_config = osc_off_rconfig,
> };
>
> -static struct of_device_id twl4030_power_of_match[] = {
> +static const struct of_device_id twl4030_power_of_match[] = {
> {
> .compatible = "ti,twl4030-power",
> },

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/