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: 4727301 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BC8C79F319 for ; Fri, 15 Aug 2014 13:02:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D93BD201E4 for ; Fri, 15 Aug 2014 13:02:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3991B20103 for ; Fri, 15 Aug 2014 13:02:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751162AbaHONCr (ORCPT ); Fri, 15 Aug 2014 09:02:47 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:40832 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750884AbaHONCq (ORCPT ); Fri, 15 Aug 2014 09:02:46 -0400 Received: by mail-wg0-f42.google.com with SMTP id l18so2245090wgh.25 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=nMuW4szHcsLWFUKzXPRIVOVbYGbuqDYuH5R5tw2NV+HeHVtgcJs9nQYj5J2pUsyaAK e8doMESa3TS3ST17RypdyQYTu4OP0u2c+Ybxozn/T3ruHD+Qefw4cewLwmZ4s5au6fyg U4Fgu0SQPSNJSJaCoNpxgTvoWZzhBiI9/KJp+cx6zawSf13tpsv/LqjhVkle6JuPLCAz hHmvohKyCyYdr3w9fZo2CmH/k0AmP+C/SUiNs6cPEfFoL8G0eAVr7vCSeFQSU8JG/40z u9c3ruaCA6YjC0kFIRHym64OqN+WqUDvpViTyPV0/JZM+wG13F2sBtP054CuRt6yQ39A jSug== X-Gm-Message-State: ALoCoQlyYpIkCUTcQ51xZjWLzeg/9HiqpPHV2bQPGfiwNZ49k96jTQ2EW4owyL4ifc1731winXGC 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 Cc: peter.griffin@linaro.org, patches@linaro.org, lee.jones@linaro.org 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 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 | 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 = {