From patchwork Fri Nov 23 05:59:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 13122 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 6998324252 for ; Fri, 23 Nov 2012 06:06:01 +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 1B2B1A18970 for ; Fri, 23 Nov 2012 06:06:01 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1416885ieb.11 for ; Thu, 22 Nov 2012 22:06:00 -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=qMk11E3LQGU65tOFlMqeR7Rm0DcdWamWYpme8O2UpY8=; b=aOOG4z07KoCMj94lid3cqPpIH/8Ovvb1lvVxnu10VfO4RF9CLZcYa1tY4gPJJWj7j0 gMh0bFt79bGRNngvUztXWYPMvxr9iE4ZSg39EFb21dZHl7K0kzbknh67ipFjestK3EUt 4hKeBZj+POGP9Q+PabIOZaXwRyV5Vxs7mcU7UBlhf+yrkmMT3j+48zJHfw/sowGB1XMg CMxlc9dkeL0I6XrOi7Kq8yx/DSlA/L+b5HVmhp1lmxI5GQ7e8ON8hVNhmvjKACHCa/ea /VMz9Ceqr7pwImY8mcgaurlL0QIU1P8RlywpfEK/QL5m0dd4/nFsbN/DeAkQAJW8K1R6 rrGg== Received: by 10.50.213.69 with SMTP id nq5mr5155655igc.70.1353650760895; Thu, 22 Nov 2012 22:06:00 -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 n20csp307457igt; Thu, 22 Nov 2012 22:06:00 -0800 (PST) Received: by 10.66.87.33 with SMTP id u1mr7515156paz.73.1353650760369; Thu, 22 Nov 2012 22:06:00 -0800 (PST) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id np6si7566926pbc.269.2012.11.22.22.06.00 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 22:06:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 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-f50.google.com with SMTP id wz7so5120069pbc.23 for ; Thu, 22 Nov 2012 22:06:00 -0800 (PST) Received: by 10.68.238.199 with SMTP id vm7mr11230066pbc.105.1353650760148; Thu, 22 Nov 2012 22:06:00 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id oi3sm3271920pbb.1.2012.11.22.22.05.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 22:05:59 -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 7/7] i2c: s3c2410: Remove err_cpufreq label Date: Fri, 23 Nov 2012 11:29:13 +0530 Message-Id: <1353650353-17576-8-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353650353-17576-1-git-send-email-tushar.behera@linaro.org> References: <1353650353-17576-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQnKJivjOzryEVcDtFKGCfe5d/IVuLMOHTtej8PESXFT4TizmegZNfTGy6J4ZsQCrmjDqDdT 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 --- 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 707efaf..c934ec8 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1053,7 +1053,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); @@ -1064,10 +1065,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