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: 4727271 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 20885C0338 for ; Fri, 15 Aug 2014 12:56:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F340201E4 for ; Fri, 15 Aug 2014 12:56:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7399B201F2 for ; Fri, 15 Aug 2014 12:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751158AbaHOMzs (ORCPT ); Fri, 15 Aug 2014 08:55:48 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:58547 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751079AbaHOMzr (ORCPT ); Fri, 15 Aug 2014 08:55:47 -0400 Received: by mail-wi0-f172.google.com with SMTP id n3so797110wiv.11 for ; Fri, 15 Aug 2014 05:55:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CF+3sWndBd4ivJ2Q/MjWvJ94RG4GVgDbOo/AwYTOC2U=; b=CiakXyEs1g03y01a35WmMM/5F8SVWBSYHNGf9uQrv2m7NtVsRVC9LGsjU/i2IUYuYd epLHWrlpOeBPzQcYhlcDxhXgC4EwTDS9QoqekTx+MPvIgsNtkjYLOD4DxU89jG8FxLSl anGHsCXJeAwU8dlZfSM9rTvLHyedHtdiygN2Gqo54MxBuXPOpT8YjWF364aiTdYJiC5a mhLE7WG2F73IY7kS0PUQSTzsfYLExdE+nYAi0wGrDDc4Nx7Tqr00U3uelYRTzP92kehw 8py3DuefHV5oESL7frZBHYHOaMarImF/Wq1AcxNlOOgAyPyCc22n6C4IMsoyexAxJMSo Ujqw== X-Gm-Message-State: ALoCoQlZjrIL25cfkybBCoo3SaQ4ydVH5Je6pGSC96cHggAKfUtHL/z/hOo37LlsRhoKPMbkPOdG 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 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP .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 = {