From patchwork Fri Mar 14 06:57:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 26245 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 45ADA20540 for ; Fri, 14 Mar 2014 06:58:03 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf8242583oag.9 for ; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=lnAcKkbZ2e8DwnI40qaB++2dYWlOkG6aitp724BkO0s=; b=I361G855xpot+P9aah7kog74dPMSlWiE7xz8o1a0ecx8yMHmvaLvVX8/k/ZoPrMKGP OCvlYodt/b06BuzKi8ZOsJr4FULQDvQv6vUOB9MjRSN4eCGNeIPYivtJfR2kahz4KAe3 +k32Vw0/yCuyEzU/z/aI/DWlUTPaaav31+mI995P+4KqeFrj8yD8kJIueJJOIiDMDC3z fLpbQ/KokbNfv+UUXo/1CaXboe+q4J/+1Q3CkHZogaN07bH1oYgeCRHQXVapLBm9gUOY 4VwkXFhSDHjxf2TJFaOUpUyqC8U175qWluKbGHXZuYnU+xZK66G4GRovcBauBdRU23ed HoTA== X-Gm-Message-State: ALoCoQkJEtxhtGlIDdwXLS68IRTI4U9/tYnaB/W8s8rmDGd/xvfPhMmpeErPjin6a5NCUkqOXfN3 X-Received: by 10.182.19.164 with SMTP id g4mr2611383obe.21.1394780282703; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.226 with SMTP id 89ls549354qgr.14.gmail; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) X-Received: by 10.58.57.67 with SMTP id g3mr4939414veq.3.1394780282607; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id ec3si1764572vcb.122.2014.03.13.23.58.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 23:58:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so2354130vcb.1 for ; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) X-Received: by 10.59.7.170 with SMTP id dd10mr4936649ved.12.1394780282506; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp31729vck; Thu, 13 Mar 2014 23:58:02 -0700 (PDT) X-Received: by 10.67.24.1 with SMTP id ie1mr7135599pad.133.1394780281696; Thu, 13 Mar 2014 23:58:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zt8si4642416pbc.15.2014.03.13.23.58.01; Thu, 13 Mar 2014 23:58:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755500AbaCNG5u (ORCPT + 26 others); Fri, 14 Mar 2014 02:57:50 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:50404 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755234AbaCNG5r (ORCPT ); Fri, 14 Mar 2014 02:57:47 -0400 Received: by mail-we0-f175.google.com with SMTP id q58so1715004wes.20 for ; Thu, 13 Mar 2014 23:57:46 -0700 (PDT) X-Received: by 10.180.189.43 with SMTP id gf11mr2753086wic.32.1394780266352; Thu, 13 Mar 2014 23:57:46 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb6sm32142099wib.2.2014.03.13.23.57.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 23:57:45 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Stephen Warren , Linus Walleij , Stephen Boyd , Bjorn Andersson Subject: [PATCH] pinctrl: msm: fix up out-of-order merge conflict Date: Fri, 14 Mar 2014 07:57:41 +0100 Message-Id: <1394780261-6030-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 051a58b4622f0e1b732acb750097c64bc00ddb93 "pinctrl: msm: Simplify msm_config_reg() and callers" removed the local "reg" variable in the msm_config_reg() function, but the earlier commit ed118a5fd951bd2def8249ee251842c4f81fe4bd "pinctrl-msm: Support output-{high,low} configuration" introduced a new switchclause using it. Fix this up by removing the offending register assignment. Reported-by: Kbuild test robot Cc: Stephen Boyd Cc: Bjorn Andersson Signed-off-by: Linus Walleij Acked-by: Bjorn Andersson --- drivers/pinctrl/pinctrl-msm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c index 19d2feb0674f..343f421c7696 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c @@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, *mask = 7; break; case PIN_CONFIG_OUTPUT: - *reg = g->ctl_reg; *bit = g->oe_bit; *mask = 1; break;