mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	gpio: mvebu: use devm_platform_ioremap_resource_byname()
Use devm_platform_ioremap_resource_byname() instead of calling platform_get_resource_byname() and devm_ioremap_resource() separately. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20191022084318.22256-8-brgl@bgdev.pl Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
		
							parent
							
								
									c9c8641d3e
								
							
						
					
					
						commit
						f51b18d92b
					
				
					 1 changed files with 7 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -773,23 +773,12 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
 | 
			
		|||
{
 | 
			
		||||
	struct device *dev = &pdev->dev;
 | 
			
		||||
	struct mvebu_pwm *mvpwm;
 | 
			
		||||
	struct resource *res;
 | 
			
		||||
	u32 set;
 | 
			
		||||
 | 
			
		||||
	if (!of_device_is_compatible(mvchip->chip.of_node,
 | 
			
		||||
				     "marvell,armada-370-gpio"))
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	/*
 | 
			
		||||
	 * There are only two sets of PWM configuration registers for
 | 
			
		||||
	 * all the GPIO lines on those SoCs which this driver reserves
 | 
			
		||||
	 * for the first two GPIO chips. So if the resource is missing
 | 
			
		||||
	 * we can't treat it as an error.
 | 
			
		||||
	 */
 | 
			
		||||
	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwm");
 | 
			
		||||
	if (!res)
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	if (IS_ERR(mvchip->clk))
 | 
			
		||||
		return PTR_ERR(mvchip->clk);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -812,7 +801,13 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
 | 
			
		|||
	mvchip->mvpwm = mvpwm;
 | 
			
		||||
	mvpwm->mvchip = mvchip;
 | 
			
		||||
 | 
			
		||||
	mvpwm->membase = devm_ioremap_resource(dev, res);
 | 
			
		||||
	/*
 | 
			
		||||
	 * There are only two sets of PWM configuration registers for
 | 
			
		||||
	 * all the GPIO lines on those SoCs which this driver reserves
 | 
			
		||||
	 * for the first two GPIO chips. So if the resource is missing
 | 
			
		||||
	 * we can't treat it as an error.
 | 
			
		||||
	 */
 | 
			
		||||
	mvpwm->membase = devm_platform_ioremap_resource_byname(pdev, "pwm");
 | 
			
		||||
	if (IS_ERR(mvpwm->membase))
 | 
			
		||||
		return PTR_ERR(mvpwm->membase);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue