From patchwork Tue Jan 4 21:10:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 451841 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 p04LB1Z7026668 for ; Tue, 4 Jan 2011 21:11:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452Ab1ADVKt (ORCPT ); Tue, 4 Jan 2011 16:10:49 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:59865 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab1ADVKs (ORCPT ); Tue, 4 Jan 2011 16:10:48 -0500 Received: by mail-ey0-f174.google.com with SMTP id 27so6488007eye.19 for ; Tue, 04 Jan 2011 13:10:47 -0800 (PST) Received: by 10.213.29.148 with SMTP id q20mr16547726ebc.73.1294175447606; Tue, 04 Jan 2011 13:10:47 -0800 (PST) Received: from localhost.localdomain (93-172-227-56.bb.netvision.net.il [93.172.227.56]) by mx.google.com with ESMTPS id t50sm15979763eeh.6.2011.01.04.13.10.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 04 Jan 2011 13:10:46 -0800 (PST) From: Ohad Ben-Cohen To: Cc: Chris Ball , Ohad Ben-Cohen Subject: [PATCH 3/4] mmc: add MMC_QUIRK_DISABLE_CD Date: Tue, 4 Jan 2011 23:10:15 +0200 Message-Id: <1294175416-12358-3-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294175416-12358-1-git-send-email-ohad@wizery.com> References: <1294175416-12358-1-git-send-email-ohad@wizery.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Tue, 04 Jan 2011 21:11:02 +0000 (UTC) diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 78be7d9..2118df2 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -181,7 +181,7 @@ static int sdio_disable_cd(struct mmc_card *card) int ret; u8 ctrl; - if (!card->cccr.disable_cd) + if (!mmc_card_disable_cd(card)) return 0; ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_IF, 0, &ctrl); diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 8ce0827..3a3c079 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -80,8 +80,7 @@ struct sdio_cccr { low_speed:1, wide_bus:1, high_power:1, - high_speed:1, - disable_cd:1; + high_speed:1; }; struct sdio_cis { @@ -121,6 +120,7 @@ struct mmc_card { /* for byte mode */ #define MMC_QUIRK_NONSTD_SDIO (1<<2) /* non-standard SDIO card attached */ /* (missing CIA registers) */ +#define MMC_QUIRK_DISABLE_CD (1<<3) /* disconnect CD/DAT[3] resistor */ unsigned int erase_size; /* erase size in sectors */ unsigned int erase_shift; /* if erase unit is power 2 */ @@ -174,6 +174,11 @@ static inline int mmc_blksz_for_byte_mode(const struct mmc_card *c) return c->quirks & MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; } +static inline int mmc_card_disable_cd(const struct mmc_card *c) +{ + return c->quirks & MMC_QUIRK_DISABLE_CD; +} + #define mmc_card_name(c) ((c)->cid.prod_name) #define mmc_card_id(c) (dev_name(&(c)->dev))