Commit 35568c40 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Linus Walleij

gpio: amd8111: Use devm_request_region

By the time request_region is called in the AMD 8111 GPIO driver, a
corresponding device structure has already been allocated. The
devm_request_region function should be used to help simplify the cleanup
code and reduce the possible points of failure.
Signed-off-by: default avatarWilliam Breathitt Gray <>
Reviewed-by: default avatarAlexandre Courbot <>
Signed-off-by: default avatarLinus Walleij <>
parent cb32389c
......@@ -25,6 +25,7 @@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/gpio.h>
......@@ -204,7 +205,8 @@ static int __init amd_gpio_init(void)
gp.pmbase &= 0x0000FF00;
if (gp.pmbase == 0)
goto out;
if (!request_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE, "AMD GPIO")) {
if (!devm_request_region(&pdev->dev, gp.pmbase + PMBASE_OFFSET,
dev_err(&pdev->dev, "AMD GPIO region 0x%x already in use!\n",
gp.pmbase + PMBASE_OFFSET);
err = -EBUSY;
......@@ -213,7 +215,6 @@ static int __init amd_gpio_init(void) = ioport_map(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
if (! {
dev_err(&pdev->dev, "Couldn't map io port into io memory\n");
release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
err = -ENOMEM;
goto out;
......@@ -228,7 +229,6 @@ static int __init amd_gpio_init(void)
printk(KERN_ERR "GPIO registering failed (%d)\n",
release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
goto out;
......@@ -239,7 +239,6 @@ static void __exit amd_gpio_exit(void)
release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment