From patchwork Mon Feb 14 07:16:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 554241 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1E7KJAr020011 for ; Mon, 14 Feb 2011 07:20:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770Ab1BNHUS (ORCPT ); Mon, 14 Feb 2011 02:20:18 -0500 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:33789 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934Ab1BNHUS convert rfc822-to-8bit (ORCPT ); Mon, 14 Feb 2011 02:20:18 -0500 Received: from source ([65.219.4.130]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKTVjXsUabQbDNgw5fjpmPI3n8XSANCOBe@postini.com; Sun, 13 Feb 2011 23:20:18 PST Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by sc-owa02.marvell.com ([10.93.76.22]) with mapi; Sun, 13 Feb 2011 23:16:17 -0800 From: Philip Rakity To: "linux-mmc@vger.kernel.org" CC: Mark Brown Date: Sun, 13 Feb 2011 23:16:15 -0800 Subject: [PATCH 1/4] mmc: rename ddr to uhs in ios structure to indicate usage Thread-Topic: [PATCH 1/4] mmc: rename ddr to uhs in ios structure to indicate usage Thread-Index: AcvMFxGsdQFtp5BOTvGIHEhSkRRbaA== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 14 Feb 2011 07:20:19 +0000 (UTC) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index d9fb0d3..37e66d3 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -718,7 +718,7 @@ void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, unsigned int ddr) { host->ios.bus_width = width; - host->ios.ddr = ddr; + host->ios.uhs = ddr; mmc_set_ios(host); } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index bcb793e..f11307e 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -51,7 +51,7 @@ struct mmc_ios { #define MMC_TIMING_MMC_HS 1 #define MMC_TIMING_SD_HS 2 - unsigned char ddr; /* dual data rate used */ + unsigned char uhs; /* uhs mode used (ddr - sdr) */ #define MMC_SDR_MODE 0 #define MMC_1_2V_DDR_MODE 1