lkml.org 
[lkml]   [2015]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/35 linux-next] w1: constify of_device_id array
    Date
    of_device_id is always used as const.
    (See driver.of_match_table and open firmware functions)

    Signed-off-by: Fabian Frederick <fabf@skynet.be>
    ---
    drivers/w1/masters/mxc_w1.c | 2 +-
    drivers/w1/masters/omap_hdq.c | 2 +-
    drivers/w1/masters/w1-gpio.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
    index 53bf2c8..a462175 100644
    --- a/drivers/w1/masters/mxc_w1.c
    +++ b/drivers/w1/masters/mxc_w1.c
    @@ -166,7 +166,7 @@ static int mxc_w1_remove(struct platform_device *pdev)
    return 0;
    }

    -static struct of_device_id mxc_w1_dt_ids[] = {
    +static const struct of_device_id mxc_w1_dt_ids[] = {
    { .compatible = "fsl,imx21-owire" },
    { /* sentinel */ }
    };
    diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
    index 03321d6..e7d4489 100644
    --- a/drivers/w1/masters/omap_hdq.c
    +++ b/drivers/w1/masters/omap_hdq.c
    @@ -72,7 +72,7 @@ struct hdq_data {
    static int omap_hdq_probe(struct platform_device *pdev);
    static int omap_hdq_remove(struct platform_device *pdev);

    -static struct of_device_id omap_hdq_dt_ids[] = {
    +static const struct of_device_id omap_hdq_dt_ids[] = {
    { .compatible = "ti,omap3-1w" },
    {}
    };
    diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
    index b99a932..8f7848c 100644
    --- a/drivers/w1/masters/w1-gpio.c
    +++ b/drivers/w1/masters/w1-gpio.c
    @@ -68,7 +68,7 @@ static u8 w1_gpio_read_bit(void *data)
    }

    #if defined(CONFIG_OF)
    -static struct of_device_id w1_gpio_dt_ids[] = {
    +static const struct of_device_id w1_gpio_dt_ids[] = {
    { .compatible = "w1-gpio" },
    {}
    };
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-03-16 20:41    [W:4.022 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site