lkml.org 
[lkml]   [2018]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/12] power: supply: account for const type of of_device_id.data
    Date
    This driver creates two const structures that it stores in the data
    field of an of_device_id array.

    The data field of an of_device_id structure has type const void *, so
    there is no need for a const-discarding cast when putting const values
    into such a structure.

    Furthermore, adding const to the declaration of the location that
    receives a const value from such a field ensures that the compiler
    will continue to check that the value is not modified. The
    const-discarding cast on the extraction from the data field is thus
    no longer needed.

    Done using Coccinelle.

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

    ---
    drivers/power/supply/axp20x_ac_power.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff -u -p a/drivers/power/supply/axp20x_ac_power.c b/drivers/power/supply/axp20x_ac_power.c
    --- a/drivers/power/supply/axp20x_ac_power.c
    +++ b/drivers/power/supply/axp20x_ac_power.c
    @@ -159,7 +159,7 @@ static int axp20x_ac_power_probe(struct
    struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
    struct power_supply_config psy_cfg = {};
    struct axp20x_ac_power *power;
    - struct axp_data *axp_data;
    + const struct axp_data *axp_data;
    static const char * const irq_names[] = { "ACIN_PLUGIN", "ACIN_REMOVAL",
    NULL };
    int i, irq, ret;
    @@ -176,7 +176,7 @@ static int axp20x_ac_power_probe(struct
    if (!power)
    return -ENOMEM;

    - axp_data = (struct axp_data *)of_device_get_match_data(&pdev->dev);
    + axp_data = of_device_get_match_data(&pdev->dev);

    if (axp_data->acin_adc) {
    power->acin_v = devm_iio_channel_get(&pdev->dev, "acin_v");
    @@ -230,10 +230,10 @@ static int axp20x_ac_power_probe(struct
    static const struct of_device_id axp20x_ac_power_match[] = {
    {
    .compatible = "x-powers,axp202-ac-power-supply",
    - .data = (void *)&axp20x_data,
    + .data = &axp20x_data,
    }, {
    .compatible = "x-powers,axp221-ac-power-supply",
    - .data = (void *)&axp22x_data,
    + .data = &axp22x_data,
    }, { /* sentinel */ }
    };
    MODULE_DEVICE_TABLE(of, axp20x_ac_power_match);
    \
     
     \ /
      Last update: 2018-01-02 15:00    [W:4.426 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site