From patchwork Wed Feb 3 20:17:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 578345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7216414012C for ; Thu, 4 Feb 2016 07:19:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Pt89bmTJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932507AbcBCURX (ORCPT ); Wed, 3 Feb 2016 15:17:23 -0500 Received: from mail-yk0-f195.google.com ([209.85.160.195]:32893 "EHLO mail-yk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932999AbcBCURU (ORCPT ); Wed, 3 Feb 2016 15:17:20 -0500 Received: by mail-yk0-f195.google.com with SMTP id r207so1152157ykd.0; Wed, 03 Feb 2016 12:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JktPNg0Zz8ineIZ56UCnCV0ZlcN4Cv+ceLSrJuUFIAY=; b=Pt89bmTJHMvV7JHGeozYkOLU6UU76FePsoO6JePXm42S1rH0Bw52UpbTo3cHykplVZ JbdHoBdpx9pBxzCHucyv3s/mk4CTQ4mKT5FmbFEtQ72ux4YfLTnBjsKlYdeVOTADDBoi PzmfMOie3Dw430n5I1jbO3BjJNaRmE9j0NPRC3a31MIjOljcO4AQCIwvQ2DN27CQyyGs Ko/xjSCr0FDv25aI5JIS+e/LcDMquna9u0iaNrJ7u6c1RGEIrFttgBASkoFvkVYVSsai 8wFitRln3W8Sx+dZbFFhFf63dQuHE/OHosKBueZsyORQDFGOr6qZpXI+CvFjJoFLSLfq aWmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JktPNg0Zz8ineIZ56UCnCV0ZlcN4Cv+ceLSrJuUFIAY=; b=Bjr7IXJalQtNTkV7DAob6WgTdIn93bzEH0UStkAp4mkb0I0cGBB7/ocQ/Qtu2R2HJT tWBJMMaZJDwOGfZ7V+XO3dvsvmdQM8lsctAdSiu7mN3yBQ8dAbjkC1bTo/xsXyyOsbxp RDoERaXPqFoFgWli+mhqHXUhX7MtgIwRiQDF7qiKt1xdJm63qMgunhdno6rbLf5/hOs0 Xc4RyQ4oVfkB+xEoWTV2r99OGmyiaGHbVIqpA87yRKgW1AQBFx3FUQnrllOqmjD3upfH HE4ZIjob+jSu0AOiGUp4pqjT0LjaLsfNf86GffkW1Qrf2+2Ed/ViEKMdQ1trGDy853xQ Co2A== X-Gm-Message-State: AG10YOR3pvZcm5iq9PrWV/r7R38SRKT51eIG6PsNeg2+0eN/Ei348KRLg0xMu224NjOf1g== X-Received: by 10.37.109.133 with SMTP id i127mr2126551ybc.158.1454530640104; Wed, 03 Feb 2016 12:17:20 -0800 (PST) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id a7sm4405274ywf.55.2016.02.03.12.17.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2016 12:17:19 -0800 (PST) From: William Breathitt Gray To: linus.walleij@linaro.org, gnurou@gmail.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] gpio: amd8111: Use devm_request_region Date: Wed, 3 Feb 2016 15:17:13 -0500 Message-Id: <2bfef1171bc4ef3f038b5560f1913f4bbb8ab171.1454530144.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: References: Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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: William Breathitt Gray Reviewed-by: Alexandre Courbot --- drivers/gpio/gpio-amd8111.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c index c7040ff..30ad7d7 100644 --- a/drivers/gpio/gpio-amd8111.c +++ b/drivers/gpio/gpio-amd8111.c @@ -25,6 +25,7 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ +#include #include #include #include @@ -204,7 +205,8 @@ found: 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, + PMBASE_SIZE, "AMD GPIO")) { dev_err(&pdev->dev, "AMD GPIO region 0x%x already in use!\n", gp.pmbase + PMBASE_OFFSET); err = -EBUSY; @@ -213,7 +215,6 @@ found: gp.pm = ioport_map(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE); if (!gp.pm) { 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 @@ found: printk(KERN_ERR "GPIO registering failed (%d)\n", err); ioport_unmap(gp.pm); - release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE); goto out; } out: @@ -239,7 +239,6 @@ static void __exit amd_gpio_exit(void) { gpiochip_remove(&gp.chip); ioport_unmap(gp.pm); - release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE); } module_init(amd_gpio_init);