| Message ID | 1328004002-24646-3-git-send-email-Barry.Song@csr.com |
|---|---|
| State | New, archived |
| Headers | show |
Barry Song wrote at Tuesday, January 31, 2012 3:00 AM: > [no description] > Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Stephen Warren <swarren@nvidia.com>
On Tue, Jan 31, 2012 at 06:00:01PM +0800, Barry Song wrote: > From: Barry Song <Baohua.Song@csr.com> > > Signed-off-by: Barry Song <Baohua.Song@csr.com> > Cc: Grant Likely <grant.likely@secretlab.ca> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Erik Gilling <konkers@google.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> This of course depends on the other patch, so I won't merge it until there is an okay from gregkh. Also, with his okay I'd be happy to take it through the gpio tree to reduce dependencies. g. > --- > drivers/gpio/gpio-tegra.c | 8 +------- > 1 files changed, 1 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c > index bdc2937..118e367 100644 > --- a/drivers/gpio/gpio-tegra.c > +++ b/drivers/gpio/gpio-tegra.c > @@ -355,13 +355,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev) > bank->irq = res->start; > } > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!res) { > - dev_err(&pdev->dev, "Missing MEM resource\n"); > - return -ENODEV; > - } > - > - regs = devm_request_and_ioremap(&pdev->dev, res); > + regs = platform_devm_request_and_ioremap(pdev, 0); > if (!regs) { > dev_err(&pdev->dev, "Couldn't ioremap regs\n"); > return -ENODEV; > -- > 1.7.1 > > > > Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom > More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index bdc2937..118e367 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -355,13 +355,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev) bank->irq = res->start; } - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Missing MEM resource\n"); - return -ENODEV; - } - - regs = devm_request_and_ioremap(&pdev->dev, res); + regs = platform_devm_request_and_ioremap(pdev, 0); if (!regs) { dev_err(&pdev->dev, "Couldn't ioremap regs\n"); return -ENODEV;