From patchwork Wed Apr 27 02:10:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Warkentin X-Patchwork-Id: 735161 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 p3R2B6tZ000523 for ; Wed, 27 Apr 2011 02:11:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756356Ab1D0CLG (ORCPT ); Tue, 26 Apr 2011 22:11:06 -0400 Received: from exprod5og109.obsmtp.com ([64.18.0.188]:42651 "EHLO exprod5og109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756227Ab1D0CLF (ORCPT ); Tue, 26 Apr 2011 22:11:05 -0400 Received: from il93mgrg01.am.mot-mobility.com ([144.188.21.13]) (using TLSv1) by exprod5ob109.postini.com ([64.18.4.12]) with SMTP ID DSNKTbd7OI400J/Py8mbiMt/443OLv2Zs4K6@postini.com; Tue, 26 Apr 2011 19:11:05 PDT Received: from il93mgrg01.am.mot-mobility.com ([10.176.129.42]) by il93mgrg01.am.mot-mobility.com (8.14.3/8.14.3) with ESMTP id p3R294WS011350 for ; Tue, 26 Apr 2011 22:09:04 -0400 (EDT) Received: from mail-gw0-f42.google.com (mail-gw0-f42.google.com [74.125.83.42]) by il93mgrg01.am.mot-mobility.com (8.14.3/8.14.3) with ESMTP id p3R288vf011004 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Tue, 26 Apr 2011 22:09:03 -0400 (EDT) Received: by mail-gw0-f42.google.com with SMTP id 17so637044gwb.15 for ; Tue, 26 Apr 2011 19:11:03 -0700 (PDT) Received: by 10.236.125.227 with SMTP id z63mr1994147yhh.125.1303870263502; Tue, 26 Apr 2011 19:11:03 -0700 (PDT) Received: from localhost.localdomain (dyngate-ca119-13.motorola.com [144.189.96.13]) by mx.google.com with ESMTPS id h28sm181781yhm.97.2011.04.26.19.11.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Apr 2011 19:11:02 -0700 (PDT) From: Andrei Warkentin To: linux-mmc@vger.kernel.org Cc: Andrei Warkentin , cjb@laptop.org Subject: [[v4] 1/5] MMC: Add/remove quirks conditional support. Date: Tue, 26 Apr 2011 21:10:31 -0500 Message-Id: <1303870235-29041-2-git-send-email-andreiw@motorola.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1303870235-29041-1-git-send-email-andreiw@motorola.com> References: <1302950458-1969-1-git-send-email-andreiw@motorola.com> <1303870235-29041-1-git-send-email-andreiw@motorola.com> X-CFilter-Loop: Reflected 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]); Wed, 27 Apr 2011 02:11:29 +0000 (UTC) Conditional add/remove quirks for MMC and SD. Cc: cjb@laptop.org Signed-off-by: Andrei Warkentin --- include/linux/mmc/card.h | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 72a9868..6a4ed2a 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -233,16 +233,14 @@ struct mmc_fixup { card->cid.month) /* - * This hook just adds a quirk unconditionally. + * Unconditionally quirk add/remove. */ + static inline void __maybe_unused add_quirk(struct mmc_card *card, int data) { card->quirks |= data; } -/* - * This hook just removes a quirk unconditionally. - */ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data) { card->quirks &= ~data; @@ -264,6 +262,40 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data) #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR) #define mmc_card_set_ddr_mode(c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR) +/* + * Quirk add/remove for MMC products. + */ + +static inline void __maybe_unused add_quirk_mmc(struct mmc_card *card, int data) +{ + if (mmc_card_mmc(card)) + card->quirks |= data; +} + +static inline void __maybe_unused remove_quirk_mmc(struct mmc_card *card, + int data) +{ + if (mmc_card_mmc(card)) + card->quirks &= ~data; +} + +/* + * Quirk add/remove for SD products. + */ + +static inline void __maybe_unused add_quirk_sd(struct mmc_card *card, int data) +{ + if (mmc_card_sd(card)) + card->quirks |= data; +} + +static inline void __maybe_unused remove_quirk_sd(struct mmc_card *card, + int data) +{ + if (mmc_card_sd(card)) + card->quirks &= ~data; +} + static inline int mmc_card_lenient_fn0(const struct mmc_card *c) { return c->quirks & MMC_QUIRK_LENIENT_FN0;