2008-08-11 22:42:17

by Ben Dooks

Subject: MMC: s3cmci: wirte get_cd host ops

Attach the routine to get_cd to allow the MMC core to find out whether
there is a card present or not without the tedious process of trying to
send commands to the card or not.

Signed-off-by: Ben Dooks <[email protected]>

Index: linux-2.6.27-rc2-quilt3/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.27-rc2-quilt3.orig/drivers/mmc/host/s3cmci.c 2008-08-11 23:33:09.000000000 +0100
+++ linux-2.6.27-rc2-quilt3/drivers/mmc/host/s3cmci.c 2008-08-11 23:39:33.000000000 +0100
@@ -1004,8 +1004,9 @@ static void s3cmci_send_request(struct m
enable_irq(host->irq);
}

-static int s3cmci_card_present(struct s3cmci_host *host)
+static int s3cmci_card_present(struct mmc_host *mmc)
{
+ struct s3cmci_host *host = mmc_priv(mmc);
struct s3c24xx_mci_pdata *pdata = host->pdata;
int ret;

@@ -1024,7 +1025,7 @@ static void s3cmci_request(struct mmc_ho
host->cmd_is_stop = 0;
host->mrq = mrq;

- if (s3cmci_card_present(host) == 0) {
+ if (s3cmci_card_present(mmc) == 0) {
dbg(host, dbg_err, "%s: no medium present\n", __func__);
host->mrq->cmd->error = -ENOMEDIUM;
mmc_request_done(mmc, mrq);
@@ -1139,6 +1140,7 @@ static struct mmc_host_ops s3cmci_ops =
.request = s3cmci_request,
.set_ios = s3cmci_set_ios,
.get_ro = s3cmci_get_ro,
+ .get_cd = s3cmci_card_present,
};

static struct s3c24xx_mci_pdata s3cmci_def_pdata = {

--
Ben ([email protected], http://www.fluff.org/)

'a smiley only costs 4 bytes'

2008-08-12 13:05:26

by Ben Dooks

Subject: Re: MMC: s3cmci: wirte get_cd host ops

On Mon, Aug 11, 2008 at 11:42:00PM +0100, Ben Dooks wrote:
> Attach the routine to get_cd to allow the MMC core to find out whether
> there is a card present or not without the tedious process of trying to
> send commands to the card or not.
>
> Signed-off-by: Ben Dooks <[email protected]>

better spelled version posted.

--
Ben ([email protected], http://www.fluff.org/)

'a smiley only costs 4 bytes'