From patchwork Fri Nov 23 08:41:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 13131 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id EC0B323FCD for ; Fri, 23 Nov 2012 08:48:48 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9979BA19042 for ; Fri, 23 Nov 2012 08:48:48 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1528362ieb.11 for ; Fri, 23 Nov 2012 00:48:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gqknZlqVCwTGhrFmQwRhvPntgtx1yO6936hOYLX4HYI=; b=DShCAgihktKmF57uZPfs4rHqDZQImnLIMo0JEYh09MHGsih7PHVg3lwsBsZNCNXjJC VJO/em6tQb9EMXwCcKwCUO4xMaoKC/cbdb61CCNnOQM+Ae3ZHR5EZsISNR/8YGVwQ1WM rdEga+3H+4mNlQpKMgcZB4XlU3Br9x+b/XRfv9v9+8u1gbVwYlObJPXUbVxWiMpdZ4ci bn68zpkGulsxRedN7bWJpUNS/iXRtvElqphDIkfLo8IRTOkf1v0QDV4mYUvXbmRZBbm+ pGMaYmak7nbD5pslWGQdW8YcZOhif58lVTmJZZqHCqe2BZwO2UVxDjTMa0WKVdmWc1x6 gnkw== Received: by 10.43.46.2 with SMTP id um2mr2579782icb.18.1353660528390; Fri, 23 Nov 2012 00:48:48 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp320683igt; Fri, 23 Nov 2012 00:48:48 -0800 (PST) Received: by 10.66.72.225 with SMTP id g1mr8469937pav.79.1353660527827; Fri, 23 Nov 2012 00:48:47 -0800 (PST) Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) by mx.google.com with ESMTPS id h9si7460735pax.126.2012.11.23.00.48.47 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 00:48:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.160.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by mail-pb0-f46.google.com with SMTP id wy7so6423950pbc.5 for ; Fri, 23 Nov 2012 00:48:47 -0800 (PST) Received: by 10.68.132.202 with SMTP id ow10mr12120996pbb.139.1353660527585; Fri, 23 Nov 2012 00:48:47 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id jw10sm3495481pbb.20.2012.11.23.00.48.41 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 00:48:44 -0800 (PST) From: Tushar Behera To: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: w.sang@pengutronix.de, kgene.kim@samsung.com, patches@linaro.org Subject: [PATCH V2 4/4] i2c: s3c2410: Remove err_cpufreq label Date: Fri, 23 Nov 2012 14:11:55 +0530 Message-Id: <1353660115-9710-5-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353660115-9710-1-git-send-email-tushar.behera@linaro.org> References: <1353660115-9710-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQkXZcmMLBDctttAZXJBRvq5r2bcgec4wNskJDpiv1WD0x3NA+a686KLvkTu+3lRUiG2LhSP err_cpufreq label is now used only once. It can be removed and related code can be moved to the caller location. Signed-off-by: Tushar Behera --- Changes since V1: * Rebased as per the V2 patch series. drivers/i2c/busses/i2c-s3c2410.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 3f2d632..ff4408d 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1044,7 +1044,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) ret = i2c_add_numbered_adapter(&i2c->adap); if (ret < 0) { dev_err(&pdev->dev, "failed to add bus to i2c core\n"); - goto err_cpufreq; + s3c24xx_i2c_deregister_cpufreq(i2c); + return ret; } of_i2c_register_devices(&i2c->adap); @@ -1055,10 +1056,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); return 0; - - err_cpufreq: - s3c24xx_i2c_deregister_cpufreq(i2c); - return ret; } /* s3c24xx_i2c_remove