lkml.org 
[lkml]   [2023]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/5] pinctrl: at91: Utilise temporary variable for struct device
    Date
    We have a temporary variable to keep pointer to struct device.
    Utilise it inside the ->probe() implementation.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/pinctrl/pinctrl-at91.c | 63 +++++++++++++++-------------------
    1 file changed, 27 insertions(+), 36 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
    index 08f88403affb..7ada36ca64eb 100644
    --- a/drivers/pinctrl/pinctrl-at91.c
    +++ b/drivers/pinctrl/pinctrl-at91.c
    @@ -1304,7 +1304,7 @@ static int at91_pinctrl_probe_dt(struct platform_device *pdev,
    if (!np)
    return -ENODEV;

    - info->dev = &pdev->dev;
    + info->dev = dev;
    info->ops = of_device_get_match_data(dev);
    at91_pinctrl_child_count(info, np);

    @@ -1324,35 +1324,30 @@ static int at91_pinctrl_probe_dt(struct platform_device *pdev,
    if (ret)
    return ret;

    - dev_dbg(&pdev->dev, "nmux = %d\n", info->nmux);
    + dev_dbg(dev, "nmux = %d\n", info->nmux);

    - dev_dbg(&pdev->dev, "mux-mask\n");
    + dev_dbg(dev, "mux-mask\n");
    tmp = info->mux_mask;
    for (i = 0; i < gpio_banks; i++) {
    - for (j = 0; j < info->nmux; j++, tmp++) {
    - dev_dbg(&pdev->dev, "%d:%d\t0x%x\n", i, j, tmp[0]);
    - }
    + for (j = 0; j < info->nmux; j++, tmp++)
    + dev_dbg(dev, "%d:%d\t0x%x\n", i, j, tmp[0]);
    }

    - dev_dbg(&pdev->dev, "nfunctions = %d\n", info->nfunctions);
    - dev_dbg(&pdev->dev, "ngroups = %d\n", info->ngroups);
    - info->functions = devm_kcalloc(&pdev->dev,
    - info->nfunctions,
    - sizeof(struct at91_pmx_func),
    - GFP_KERNEL);
    + dev_dbg(dev, "nfunctions = %d\n", info->nfunctions);
    + dev_dbg(dev, "ngroups = %d\n", info->ngroups);
    + info->functions = devm_kcalloc(dev, info->nfunctions, sizeof(*info->functions),
    + GFP_KERNEL);
    if (!info->functions)
    return -ENOMEM;

    - info->groups = devm_kcalloc(&pdev->dev,
    - info->ngroups,
    - sizeof(struct at91_pin_group),
    - GFP_KERNEL);
    + info->groups = devm_kcalloc(dev, info->ngroups, sizeof(*info->groups),
    + GFP_KERNEL);
    if (!info->groups)
    return -ENOMEM;

    - dev_dbg(&pdev->dev, "nbanks = %d\n", gpio_banks);
    - dev_dbg(&pdev->dev, "nfunctions = %d\n", info->nfunctions);
    - dev_dbg(&pdev->dev, "ngroups = %d\n", info->ngroups);
    + dev_dbg(dev, "nbanks = %d\n", gpio_banks);
    + dev_dbg(dev, "nfunctions = %d\n", info->nfunctions);
    + dev_dbg(dev, "ngroups = %d\n", info->ngroups);

    i = 0;

    @@ -1376,7 +1371,7 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
    struct pinctrl_pin_desc *pdesc;
    int ret, i, j, k;

    - info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
    + info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL);
    if (!info)
    return -ENOMEM;

    @@ -1384,13 +1379,10 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
    if (ret)
    return ret;

    - at91_pinctrl_desc.name = dev_name(&pdev->dev);
    + at91_pinctrl_desc.name = dev_name(dev);
    at91_pinctrl_desc.npins = gpio_banks * MAX_NB_GPIO_PER_BANK;
    at91_pinctrl_desc.pins = pdesc =
    - devm_kcalloc(&pdev->dev,
    - at91_pinctrl_desc.npins, sizeof(*pdesc),
    - GFP_KERNEL);
    -
    + devm_kcalloc(dev, at91_pinctrl_desc.npins, sizeof(*pdesc), GFP_KERNEL);
    if (!at91_pinctrl_desc.pins)
    return -ENOMEM;

    @@ -1413,8 +1405,7 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
    }

    platform_set_drvdata(pdev, info);
    - info->pctl = devm_pinctrl_register(&pdev->dev, &at91_pinctrl_desc,
    - info);
    + info->pctl = devm_pinctrl_register(dev, &at91_pinctrl_desc, info);
    if (IS_ERR(info->pctl))
    return dev_err_probe(dev, PTR_ERR(info->pctl), "could not register AT91 pinctrl driver\n");

    @@ -1423,7 +1414,7 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
    if (gpio_chips[i])
    pinctrl_add_gpio_range(info->pctl, &gpio_chips[i]->range);

    - dev_info(&pdev->dev, "initialized AT91 pinctrl driver\n");
    + dev_info(dev, "initialized AT91 pinctrl driver\n");

    return 0;
    }
    @@ -1714,6 +1705,7 @@ static void gpio_irq_handler(struct irq_desc *desc)
    static int at91_gpio_of_irq_setup(struct platform_device *pdev,
    struct at91_gpio_chip *at91_gpio)
    {
    + struct device *dev = &pdev->dev;
    struct gpio_chip *gpiochip_prev = NULL;
    struct at91_gpio_chip *prev = NULL;
    struct irq_data *d = irq_get_irq_data(at91_gpio->pioc_virq);
    @@ -1721,8 +1713,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,
    struct gpio_irq_chip *girq;
    int i;

    - gpio_irqchip = devm_kzalloc(&pdev->dev, sizeof(*gpio_irqchip),
    - GFP_KERNEL);
    + gpio_irqchip = devm_kzalloc(dev, sizeof(*gpio_irqchip), GFP_KERNEL);
    if (!gpio_irqchip)
    return -ENOMEM;

    @@ -1758,7 +1749,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,
    if (!gpiochip_prev) {
    girq->parent_handler = gpio_irq_handler;
    girq->num_parents = 1;
    - girq->parents = devm_kcalloc(&pdev->dev, 1,
    + girq->parents = devm_kcalloc(dev, girq->num_parents,
    sizeof(*girq->parents),
    GFP_KERNEL);
    if (!girq->parents)
    @@ -1824,7 +1815,7 @@ static int at91_gpio_probe(struct platform_device *pdev)
    if (irq < 0)
    return irq;

    - at91_chip = devm_kzalloc(&pdev->dev, sizeof(*at91_chip), GFP_KERNEL);
    + at91_chip = devm_kzalloc(dev, sizeof(*at91_chip), GFP_KERNEL);
    if (!at91_chip)
    return -ENOMEM;

    @@ -1836,7 +1827,7 @@ static int at91_gpio_probe(struct platform_device *pdev)
    at91_chip->pioc_virq = irq;
    at91_chip->pioc_idx = alias_idx;

    - at91_chip->clock = devm_clk_get_enabled(&pdev->dev, NULL);
    + at91_chip->clock = devm_clk_get_enabled(dev, NULL);
    if (IS_ERR(at91_chip->clock))
    return dev_err_probe(dev, PTR_ERR(at91_chip->clock), "failed to get clock, ignoring.\n");

    @@ -1844,8 +1835,8 @@ static int at91_gpio_probe(struct platform_device *pdev)
    at91_chip->id = alias_idx;

    chip = &at91_chip->chip;
    - chip->label = dev_name(&pdev->dev);
    - chip->parent = &pdev->dev;
    + chip->label = dev_name(dev);
    + chip->parent = dev;
    chip->owner = THIS_MODULE;
    chip->base = alias_idx * MAX_NB_GPIO_PER_BANK;

    @@ -1886,7 +1877,7 @@ static int at91_gpio_probe(struct platform_device *pdev)
    platform_set_drvdata(pdev, at91_chip);
    gpio_banks = max(gpio_banks, alias_idx + 1);

    - dev_info(&pdev->dev, "at address %p\n", at91_chip->regbase);
    + dev_info(dev, "at address %p\n", at91_chip->regbase);

    return 0;
    }
    --
    2.39.1
    \
     
     \ /
      Last update: 2023-03-27 00:20    [W:3.375 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site