From patchwork Thu Jan 24 10:11:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 14264 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 3FE5C23F02 for ; Thu, 24 Jan 2013 10:20:25 +0000 (UTC) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by fiordland.canonical.com (Postfix) with ESMTP id D5C18A1867D for ; Thu, 24 Jan 2013 10:20:24 +0000 (UTC) Received: by mail-vb0-f49.google.com with SMTP id s24so7043332vbi.36 for ; Thu, 24 Jan 2013 02:20:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=yGL4pXIGjU+A+Dk8uh080vo1jSLKjvOk1fCc6sl4Hrc=; b=IivhWAfiq/tCki75my0vPhlX6peC01RdeVBpsGXnfVihEnp9t0ZefSi8iAKF7a7Spw iyT+muXeoxuR30ZeJB9QRBMpHBkBdv+4xUPRrpbo2zIIqJV/cp3jF0dz5Y7n7Cp1Fcwy 9yMRpxKmDOrFPlQCs9Vrr8pWbNTqIVE/SoQ9hKMKahZNniYJCz4ako0jFacSoRdJ5gKQ Wty5f/lUNmp/VTLVuiWlkOc2j0KRbcD6NKyEqhPl4Ja8e1kLDXVghiWWMEt41MpSze0w L6HVu9aKJ5utC78JPIDYYM/F6+YCvAO+NjMpiKgBy67RyJt8enrS+o7XWJ6S6ycN0lZ2 n8MQ== X-Received: by 10.220.39.69 with SMTP id f5mr1295644vce.45.1359022824347; Thu, 24 Jan 2013 02:20:24 -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.58.145.101 with SMTP id st5csp56447veb; Thu, 24 Jan 2013 02:20:23 -0800 (PST) X-Received: by 10.68.231.41 with SMTP id td9mr3313641pbc.128.1359022823492; Thu, 24 Jan 2013 02:20:23 -0800 (PST) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by mx.google.com with ESMTPS id zs6si23467510pbc.181.2013.01.24.02.20.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jan 2013 02:20:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.54 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.220.54; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.54 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-pa0-f54.google.com with SMTP id bi5so5458253pad.41 for ; Thu, 24 Jan 2013 02:20:23 -0800 (PST) X-Received: by 10.66.73.138 with SMTP id l10mr3321429pav.44.1359022823058; Thu, 24 Jan 2013 02:20:23 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id ho4sm14625980pbc.54.2013.01.24.02.20.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 24 Jan 2013 02:20:21 -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 V3 4/4] i2c: s3c2410: Remove err_cpufreq label Date: Thu, 24 Jan 2013 15:41:09 +0530 Message-Id: <1359022269-12593-5-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1359022269-12593-1-git-send-email-tushar.behera@linaro.org> References: <1359022269-12593-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQk8dnqLULLm7gsS4kRVjESENLtgnHEoprKIWqgW/arrCJYcdKbwydFEViNEABaZw8TTRe60 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 V2: * Rebased to v3.8-rc4. 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 4d1ba8d..3479ca7 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1109,7 +1109,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); @@ -1120,10 +1121,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