lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 3/9] pwm: lpss: Move resource mapping to the glue drivers
    Date
    Move resource mapping to the glue drivers which helps
    to transform pwm_lpss_probe() to pure library function
    that may be used by others without need of specific
    resource management.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/pwm/pwm-lpss-pci.c | 6 +++++-
    drivers/pwm/pwm-lpss-platform.c | 9 ++++++---
    drivers/pwm/pwm-lpss.c | 7 ++-----
    drivers/pwm/pwm-lpss.h | 2 +-
    4 files changed, 14 insertions(+), 10 deletions(-)

    diff --git a/drivers/pwm/pwm-lpss-pci.c b/drivers/pwm/pwm-lpss-pci.c
    index 9f2c666b95ec..f3367e844e61 100644
    --- a/drivers/pwm/pwm-lpss-pci.c
    +++ b/drivers/pwm/pwm-lpss-pci.c
    @@ -25,8 +25,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
    if (err < 0)
    return err;

    + err = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));
    + if (err)
    + return err;
    +
    info = (struct pwm_lpss_boardinfo *)id->driver_data;
    - lpwm = pwm_lpss_probe(&pdev->dev, &pdev->resource[0], info);
    + lpwm = pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info);
    if (IS_ERR(lpwm))
    return PTR_ERR(lpwm);

    diff --git a/drivers/pwm/pwm-lpss-platform.c b/drivers/pwm/pwm-lpss-platform.c
    index 96fde1b2b967..af57472f3ddc 100644
    --- a/drivers/pwm/pwm-lpss-platform.c
    +++ b/drivers/pwm/pwm-lpss-platform.c
    @@ -20,16 +20,19 @@ static int pwm_lpss_probe_platform(struct platform_device *pdev)
    const struct pwm_lpss_boardinfo *info;
    const struct acpi_device_id *id;
    struct pwm_lpss_chip *lpwm;
    - struct resource *r;
    + void __iomem *base;

    id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev);
    if (!id)
    return -ENODEV;

    info = (const struct pwm_lpss_boardinfo *)id->driver_data;
    - r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

    - lpwm = pwm_lpss_probe(&pdev->dev, r, info);
    + base = devm_platform_ioremap_resource(pdev, 0);
    + if (IS_ERR(base))
    + return PTR_ERR(base);
    +
    + lpwm = pwm_lpss_probe(&pdev->dev, base, info);
    if (IS_ERR(lpwm))
    return PTR_ERR(lpwm);

    diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
    index a82a57eb2482..44f9bb80611d 100644
    --- a/drivers/pwm/pwm-lpss.c
    +++ b/drivers/pwm/pwm-lpss.c
    @@ -207,7 +207,7 @@ static const struct pwm_ops pwm_lpss_ops = {
    .owner = THIS_MODULE,
    };

    -struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
    +struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, void __iomem *base,
    const struct pwm_lpss_boardinfo *info)
    {
    struct pwm_lpss_chip *lpwm;
    @@ -222,10 +222,7 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
    if (!lpwm)
    return ERR_PTR(-ENOMEM);

    - lpwm->regs = devm_ioremap_resource(dev, r);
    - if (IS_ERR(lpwm->regs))
    - return ERR_CAST(lpwm->regs);
    -
    + lpwm->regs = base;
    lpwm->info = info;

    c = lpwm->info->clk_rate;
    diff --git a/drivers/pwm/pwm-lpss.h b/drivers/pwm/pwm-lpss.h
    index 3864f32c2487..5995b6b750a8 100644
    --- a/drivers/pwm/pwm-lpss.h
    +++ b/drivers/pwm/pwm-lpss.h
    @@ -63,7 +63,7 @@ static __maybe_unused const struct pwm_lpss_boardinfo pwm_lpss_tng_info = {
    .base_unit_bits = 22,
    };

    -struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
    +struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, void __iomem *base,
    const struct pwm_lpss_boardinfo *info);

    #endif /* __PWM_LPSS_H */
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-09-06 22:06    [W:4.381 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site