From patchwork Wed Oct 24 13:17:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12466 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 65FE223E29 for ; Wed, 24 Oct 2012 13:17:55 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id C551EA18805 for ; Wed, 24 Oct 2012 13:17:54 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so586826iej.11 for ; Wed, 24 Oct 2012 06:17:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=PL1uGPT65RdQrMKkA6uruo6iQ9uDzGnUGeHcI+lHjTU=; b=e+rf5BmPNOei+uOs7jbTCMA5hrzISTsRV7IY+X4nNxTgu9OBtqtxSnqj9AvNjWfXeg DwtwmlUi2rgXjQDetW02gmDBu3f3qTXUSaLZyb2LERZ45tzgK0J7oQ6+kDNWHl+vb+Ag gZEz83qn9ghWkuNFAsnZK3IwutROM8NtFrxT/bRAFj2zZOdan8LYGuYE70TUIhQuH5XG XQbgtesrJO4gCzxU0I5jqxLmCdqxIWEMblj4DcVJh1FkX2XwwrWuu95HE5XKzsLesC+k BVjUZoTgLf19MgqFg7onPW84EBkzVorF50Vnx52swNYE7GK7N3B/AhP5o1WUXP8G+4Hv kJkw== Received: by 10.50.161.169 with SMTP id xt9mr803538igb.62.1351084674021; Wed, 24 Oct 2012 06:17:54 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp612911igt; Wed, 24 Oct 2012 06:17:52 -0700 (PDT) Received: by 10.180.84.41 with SMTP id v9mr5936894wiy.8.1351084672017; Wed, 24 Oct 2012 06:17:52 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id df2si4506544wib.2.2012.10.24.06.17.51 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 06:17:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f172.google.com with SMTP id hq12so4007629wib.13 for ; Wed, 24 Oct 2012 06:17:51 -0700 (PDT) Received: by 10.180.92.103 with SMTP id cl7mr5908397wib.16.1351084671243; Wed, 24 Oct 2012 06:17:51 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id eq2sm4925840wib.1.2012.10.24.06.17.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 06:17:50 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , Chris Ball , linux-mmc@vger.kernel.org Subject: [PATCH 1/1] mmc: Standardise capability type Date: Wed, 24 Oct 2012 14:17:44 +0100 Message-Id: <1351084664-30526-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQkVH1XWd9VToJizs90SnFe/ncCK3lU8rJn1BuXqcHhfsIAuBEUakv8T7tpnVHYEpkZEUhSh There are discrepancies with regards to how MMC capabilities are carried throughout the subsystem. Let's standardise them to elevate any confusion. Cc: Chris Ball Cc: linux-mmc@vger.kernel.org Signed-off-by: Lee Jones --- drivers/mmc/core/mmc.c | 2 +- include/linux/mmc/dw_mmc.h | 4 ++-- include/linux/mmc/host.h | 2 +- include/linux/mmc/sdhci.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 7cc4638..f31bf80 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -239,7 +239,7 @@ static void mmc_select_card_type(struct mmc_card *card) { struct mmc_host *host = card->host; u8 card_type = card->ext_csd.raw_card_type & EXT_CSD_CARD_TYPE_MASK; - unsigned int caps = host->caps, caps2 = host->caps2; + unsigned long caps = host->caps, caps2 = host->caps2; unsigned int hs_max_dtr = 0; if (card_type & EXT_CSD_CARD_TYPE_26) diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7c6a113..60b71ae 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -229,8 +229,8 @@ struct dw_mci_board { u32 quirks; /* Workaround / Quirk flags */ unsigned int bus_hz; /* Clock speed at the cclk_in pad */ - unsigned int caps; /* Capabilities */ - unsigned int caps2; /* More capabilities */ + unsigned long caps; /* Capabilities */ + unsigned long caps2; /* More capabilities */ /* * Override fifo depth. If 0, autodetect it from the FIFOTH register, * but note that this may not be reliable after a bootloader has used diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 7abb0e1..f89c968 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -241,7 +241,7 @@ struct mmc_host { #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ #define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */ - unsigned int caps2; /* More host capabilities */ + unsigned long caps2; /* More host capabilities */ #define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */ #define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */ diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index fa8529a..8c20910 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -157,8 +157,8 @@ struct sdhci_host { struct timer_list timer; /* Timer for timeouts */ - unsigned int caps; /* Alternative CAPABILITY_0 */ - unsigned int caps1; /* Alternative CAPABILITY_1 */ + unsigned long caps; /* Alternative CAPABILITY_0 */ + unsigned long caps1; /* Alternative CAPABILITY_1 */ unsigned int ocr_avail_sdio; /* OCR bit masks */ unsigned int ocr_avail_sd;