From patchwork Fri Aug 15 13:02:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 4727321 Return-Path: X-Original-To: patchwork-linux-arm@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 2B687C0338 for ; Fri, 15 Aug 2014 13:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E1FD2017D for ; Fri, 15 Aug 2014 13:06:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60A6C2013A for ; Fri, 15 Aug 2014 13:06:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XIH9z-00044w-Q9; Fri, 15 Aug 2014 13:03:11 +0000 Received: from mail-wi0-f178.google.com ([209.85.212.178]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XIH9x-00040t-A0 for linux-arm-kernel@lists.infradead.org; Fri, 15 Aug 2014 13:03:09 +0000 Received: by mail-wi0-f178.google.com with SMTP id hi2so784165wib.17 for ; Fri, 15 Aug 2014 06:02:45 -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=+Hj24Wz4D7Y+R3kMdR2jw0SyTTu+TpRUzzhAb9WYGMk=; b=ewtMIxS+tHd87KILsI4jRcJlqhlsdItDufuyyCGktlCjQlaXyt56EaR1u52zJra9iV TOfzY4gghuOossVWMu0DMxYdy8A007hP4R3rPq2Pf2cbHtd36cQpXJV615rdvofUDfc6 UhgEgJLwpFu3r4h6MnRoqMuCctXyiGUw7LUOi4A9/+n31pv8sPponqLg4Iw//A1lg/AP j6+obcL5WDQYVHqy1QX9QheakgMVExrHhRSbM2L9N0KNfnxKY+9cOqLuxjV2L0/Aw64c 6eO5NsSlxdyu3dWeaWlIria2kUDebhIk75AsilGiXAxhVikIMWMWFt+gzQVfzcsiVbhQ S9Qg== X-Gm-Message-State: ALoCoQkTQSxnrNB8gyyvcb6k475/5M3ZiejMGF4NcPF2UdRSmK7tW6uUJHXuMU4pdHbpxlcEo0tc X-Received: by 10.194.188.46 with SMTP id fx14mr11992862wjc.112.1408107765266; Fri, 15 Aug 2014 06:02:45 -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 fs3sm6616268wic.20.2014.08.15.06.02.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Aug 2014 06:02:44 -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 Subject: [PATCH v3] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently Date: Fri, 15 Aug 2014 14:02:15 +0100 Message-Id: <1408107735-20775-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140815_060309_504980_A17E2001 X-CRM114-Status: GOOD ( 10.62 ) X-Spam-Score: -0.7 (/) Cc: peter.griffin@linaro.org, lee.jones@linaro.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 6f842fb..3434c79 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -224,12 +224,11 @@ static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs) static const struct sdhci_ops pxav3_sdhci_ops = { .set_clock = sdhci_set_clock, - .set_uhs_signaling = pxav3_set_uhs_signaling, .platform_send_init_74_clocks = pxav3_gen_init_74_clocks, .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, + .set_uhs_signaling = pxav3_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_pxav3_pdata = {