Commit 68af6fb0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Thierry Reding
Browse files

pwm: lpss: Move resource mapping to the glue drivers 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent a3682d2f

drivers/pwm/pwm-lpss-pci.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

drivers/pwm/pwm-lpss-platform.c

+6 −3
Original line number Diff line number Diff line
@@ -21,16 +21,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);

drivers/pwm/pwm-lpss.c

+2 −5
Original line number Diff line number Diff line
@@ -243,7 +243,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;
@@ -258,10 +258,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;

drivers/pwm/pwm-lpss.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info; 
extern const struct pwm_lpss_boardinfo pwm_lpss_bxt_info;

extern const struct pwm_lpss_boardinfo pwm_lpss_tng_info;



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 */