From patchwork Fri Aug 15 12:55:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 35462 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5281C20523 for ; Fri, 15 Aug 2014 12:55:48 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id m1sf15049708oag.11 for ; Fri, 15 Aug 2014 05:55:47 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=CF+3sWndBd4ivJ2Q/MjWvJ94RG4GVgDbOo/AwYTOC2U=; b=jy0XbGXK1Q2WtDx+Gkb4YJAsdFUCMF+W/vl3qMVFxlWErkFeLilCSwCXsk2JU1CnCj PZoYRf4GksY66EKrvXfN/l5TFEZvKU9hVNv8i3Fl+LyQ/xCTiLLNdr7as/P2VpPbwgIC brnPptmN0Rpaw4HwnxEfth/i7mh0ciRHaUcB/wa7Tq3Lx6Nskad8Zfwr59OX76qqQgB+ 6QaoLN7Q2qKrQL7OC/PScNiFJNbS/mMLM8gfuVq7G8a9wTc/6gitVEqzMjLHUI56U8D2 mZF7G0o9fbvagVHC7yG+Tj57ZaaFK0LWdPW1xqK0UpQJL8OODe05U2Sj1JgGNu7lLcNb R0xw== X-Gm-Message-State: ALoCoQl2hUrbvwzHJT5VgxPHeZAX3CPl8icS8Sz04cJ5TFrXf4ryyXo7oSlaFpYLayYyIuszaJsZ X-Received: by 10.182.123.163 with SMTP id mb3mr8866025obb.32.1408107347953; Fri, 15 Aug 2014 05:55:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.106.136 with SMTP id e8ls243438qgf.36.gmail; Fri, 15 Aug 2014 05:55:47 -0700 (PDT) X-Received: by 10.224.63.18 with SMTP id z18mr27843133qah.23.1408107347778; Fri, 15 Aug 2014 05:55:47 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id l67si11687755qgf.95.2014.08.15.05.55.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Aug 2014 05:55:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so2822872vcb.6 for ; Fri, 15 Aug 2014 05:55:47 -0700 (PDT) X-Received: by 10.52.1.39 with SMTP id 7mr906374vdj.17.1408107347574; Fri, 15 Aug 2014 05:55:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp110418vcb; Fri, 15 Aug 2014 05:55:47 -0700 (PDT) X-Received: by 10.194.80.9 with SMTP id n9mr7468654wjx.57.1408107346662; Fri, 15 Aug 2014 05:55:46 -0700 (PDT) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mx.google.com with ESMTPS id i8si2546816wiy.34.2014.08.15.05.55.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Aug 2014 05:55:46 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 74.125.82.49 as permitted sender) client-ip=74.125.82.49; Received: by mail-wg0-f49.google.com with SMTP id k14so2335423wgh.32 for ; Fri, 15 Aug 2014 05:55:46 -0700 (PDT) X-Received: by 10.195.13.102 with SMTP id ex6mr20043769wjd.48.1408107346150; Fri, 15 Aug 2014 05:55:46 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id ft17sm18754409wjc.14.2014.08.15.05.55.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Aug 2014 05:55:45 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, chris@printf.net, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, zhangfei.gao@marvell.com, prakity@marvell.com, rmk+kernel@arm.linux.org.uk Cc: peter.griffin@linaro.org, patches@linaro.org, lee.jones@linaro.org Subject: [PATCH v2] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently Date: Fri, 15 Aug 2014 13:55:42 +0100 Message-Id: <1408107342-20318-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , .set_uhs_signaling field is currently initialised twice once to the arch specific callback pxav3_set_uhs_signaling, and also to the generic sdhci_set_uhs_signaling callback. This means that uhs is currently broken for this platform currently, as pxav3 has some special constriants which means it can't use the generic callback. This happened in commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function") commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")' Fix this and hopefully prevent it happening in the future by ensuring named initialisers always follow the declaration order in the structure definition. Signed-off-by: Peter Griffin --- drivers/mmc/host/sdhci-pxav3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 6f842fb..3f350ea 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -229,7 +229,6 @@ static const struct sdhci_ops pxav3_sdhci_ops = { .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = sdhci_set_bus_width, .reset = pxav3_reset, - .set_uhs_signaling = sdhci_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_pxav3_pdata = {