From patchwork Thu Oct 31 17:57:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 3121601 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AC03B9F3E2 for ; Thu, 31 Oct 2013 17:54:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A186020453 for ; Thu, 31 Oct 2013 18:00:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2FB2202E6 for ; Thu, 31 Oct 2013 18:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754615Ab3JaR6U (ORCPT ); Thu, 31 Oct 2013 13:58:20 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:43645 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158Ab3JaR6S (ORCPT ); Thu, 31 Oct 2013 13:58:18 -0400 Received: by mail-la0-f42.google.com with SMTP id ea20so2614830lab.15 for ; Thu, 31 Oct 2013 10:58:17 -0700 (PDT) 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=9smMKOazmgJdvc4C/WZyMjzg8cw3Qg2mKc219tOq/5A=; b=r99JL+0IcPF+OaGsXYR9JUeGCPsoIyUzGqgGYkPW070d6RNmq9pHmQQpLOZCepTuw1 70Zou4j7vY7imzLsNz6JoES8P1zbGlB6Nvs7EvE9ffqI4AObKAQsoBO1SUuI4gPkYfii /Eto8PaUrVH5UEDdHK8K4Yd4qsZVG1XRfwU9TJli+kYCIOb0axEua6fqfEaBDbQSmL/z 2tQiNDPQr5/jBMMhy+vNf8ACeF088YNnc6BcMbtInyWJJJTJvV2woQrWDKqnimp2I/YT XQvtysU6pqF4ZMQ4J4ZJwpWwy3pNr/mrOekGaypmHuAnM9hEnhtjezzGYkPhp9b6h7t8 ZQmA== X-Received: by 10.112.53.198 with SMTP id d6mr1972335lbp.47.1383242297243; Thu, 31 Oct 2013 10:58:17 -0700 (PDT) Received: from xi.terra (c193-14-141-227.cust.tele2.se. [193.14.141.227]) by mx.google.com with ESMTPSA id zc3sm3466618lbb.2.2013.10.31.10.58.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 31 Oct 2013 10:58:16 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.80.1) (envelope-from ) id 1VbwVY-00020r-Om; Thu, 31 Oct 2013 18:58:12 +0100 From: Johan Hovold To: Richard Purdie , Jingoo Han Cc: Nicolas Ferre , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Andrew Morton , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 4/9] backlight: atmel-pwm-bl: clean up probe error handling Date: Thu, 31 Oct 2013 18:57:39 +0100 Message-Id: <1383242264-7652-5-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1383242264-7652-1-git-send-email-jhovold@gmail.com> References: <1383064064-4983-1-git-send-email-jhovold@gmail.com> <1383242264-7652-1-git-send-email-jhovold@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up probe error handling by checking parameters before any allocations and removing an obsolete error label. Also remove unnecessary reset of private gpio number. Acked-by: Jingoo Han Signed-off-by: Johan Hovold --- drivers/video/backlight/atmel-pwm-bl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c index 4886028..01af5c2 100644 --- a/drivers/video/backlight/atmel-pwm-bl.c +++ b/drivers/video/backlight/atmel-pwm-bl.c @@ -126,40 +126,33 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) struct atmel_pwm_bl *pwmbl; int retval; + pdata = dev_get_platdata(&pdev->dev); + if (!pdata) + return -ENODEV; + + if (pdata->pwm_compare_max < pdata->pwm_duty_max || + pdata->pwm_duty_min > pdata->pwm_duty_max || + pdata->pwm_frequency == 0) + return -EINVAL; + pwmbl = devm_kzalloc(&pdev->dev, sizeof(struct atmel_pwm_bl), GFP_KERNEL); if (!pwmbl) return -ENOMEM; pwmbl->pdev = pdev; - - pdata = dev_get_platdata(&pdev->dev); - if (!pdata) { - retval = -ENODEV; - goto err_free_mem; - } - - if (pdata->pwm_compare_max < pdata->pwm_duty_max || - pdata->pwm_duty_min > pdata->pwm_duty_max || - pdata->pwm_frequency == 0) { - retval = -EINVAL; - goto err_free_mem; - } - pwmbl->pdata = pdata; pwmbl->gpio_on = pdata->gpio_on; retval = pwm_channel_alloc(pdata->pwm_channel, &pwmbl->pwmc); if (retval) - goto err_free_mem; + return retval; if (pwmbl->gpio_on != -1) { retval = devm_gpio_request(&pdev->dev, pwmbl->gpio_on, "gpio_atmel_pwm_bl"); - if (retval) { - pwmbl->gpio_on = -1; + if (retval) goto err_free_pwm; - } /* Turn display off by default. */ retval = gpio_direction_output(pwmbl->gpio_on, @@ -197,7 +190,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) err_free_pwm: pwm_channel_free(&pwmbl->pwmc); -err_free_mem: + return retval; }