mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	drivers: gpio: sta2x11: use devm_platform_ioremap_resource()
Use the new helper that wraps the calls to platform_get_resource() and devm_ioremap_resource() together. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
		
							parent
							
								
									7290f152fe
								
							
						
					
					
						commit
						c68a520f6a
					
				
					 1 changed files with 1 additions and 4 deletions
				
			
		| 
						 | 
					@ -360,7 +360,6 @@ static int gsta_probe(struct platform_device *dev)
 | 
				
			||||||
	struct pci_dev *pdev;
 | 
						struct pci_dev *pdev;
 | 
				
			||||||
	struct sta2x11_gpio_pdata *gpio_pdata;
 | 
						struct sta2x11_gpio_pdata *gpio_pdata;
 | 
				
			||||||
	struct gsta_gpio *chip;
 | 
						struct gsta_gpio *chip;
 | 
				
			||||||
	struct resource *res;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pdev = *(struct pci_dev **)dev_get_platdata(&dev->dev);
 | 
						pdev = *(struct pci_dev **)dev_get_platdata(&dev->dev);
 | 
				
			||||||
	gpio_pdata = dev_get_platdata(&pdev->dev);
 | 
						gpio_pdata = dev_get_platdata(&pdev->dev);
 | 
				
			||||||
| 
						 | 
					@ -369,13 +368,11 @@ static int gsta_probe(struct platform_device *dev)
 | 
				
			||||||
		dev_err(&dev->dev, "no gpio config\n");
 | 
							dev_err(&dev->dev, "no gpio config\n");
 | 
				
			||||||
	pr_debug("gpio config: %p\n", gpio_pdata);
 | 
						pr_debug("gpio config: %p\n", gpio_pdata);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	chip = devm_kzalloc(&dev->dev, sizeof(*chip), GFP_KERNEL);
 | 
						chip = devm_kzalloc(&dev->dev, sizeof(*chip), GFP_KERNEL);
 | 
				
			||||||
	if (!chip)
 | 
						if (!chip)
 | 
				
			||||||
		return -ENOMEM;
 | 
							return -ENOMEM;
 | 
				
			||||||
	chip->dev = &dev->dev;
 | 
						chip->dev = &dev->dev;
 | 
				
			||||||
	chip->reg_base = devm_ioremap_resource(&dev->dev, res);
 | 
						chip->reg_base = devm_platform_ioremap_resource(dev, 0);
 | 
				
			||||||
	if (IS_ERR(chip->reg_base))
 | 
						if (IS_ERR(chip->reg_base))
 | 
				
			||||||
		return PTR_ERR(chip->reg_base);
 | 
							return PTR_ERR(chip->reg_base);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue