Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
sdricoh_cs: removed unused #include <version.h>
s3cmci: attach get_cd host ops
s3cmci: fix sparse errors from non-exported functions
+10
-7
drivers/mmc/host/s3cmci.c
+10
-7
drivers/mmc/host/s3cmci.c
···
595
595
return IRQ_HANDLED;
596
596
}
597
597
598
-
void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
599
-
int size, enum s3c2410_dma_buffresult result)
598
+
static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch,
599
+
void *buf_id, int size,
600
+
enum s3c2410_dma_buffresult result)
600
601
{
601
602
struct s3cmci_host *host = buf_id;
602
603
unsigned long iflags;
···
741
740
mmc_request_done(host->mmc, mrq);
742
741
}
743
742
744
-
745
-
void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)
743
+
static void s3cmci_dma_setup(struct s3cmci_host *host,
744
+
enum s3c2410_dmasrc source)
746
745
{
747
746
static enum s3c2410_dmasrc last_source = -1;
748
747
static int setup_ok;
···
1004
1003
enable_irq(host->irq);
1005
1004
}
1006
1005
1007
-
static int s3cmci_card_present(struct s3cmci_host *host)
1006
+
static int s3cmci_card_present(struct mmc_host *mmc)
1008
1007
{
1008
+
struct s3cmci_host *host = mmc_priv(mmc);
1009
1009
struct s3c24xx_mci_pdata *pdata = host->pdata;
1010
1010
int ret;
1011
1011
···
1025
1023
host->cmd_is_stop = 0;
1026
1024
host->mrq = mrq;
1027
1025
1028
-
if (s3cmci_card_present(host) == 0) {
1026
+
if (s3cmci_card_present(mmc) == 0) {
1029
1027
dbg(host, dbg_err, "%s: no medium present\n", __func__);
1030
1028
host->mrq->cmd->error = -ENOMEDIUM;
1031
1029
mmc_request_done(mmc, mrq);
···
1140
1138
.request = s3cmci_request,
1141
1139
.set_ios = s3cmci_set_ios,
1142
1140
.get_ro = s3cmci_get_ro,
1141
+
.get_cd = s3cmci_card_present,
1143
1142
};
1144
1143
1145
1144
static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
···
1209
1206
}
1210
1207
1211
1208
host->base = ioremap(host->mem->start, RESSIZE(host->mem));
1212
-
if (host->base == 0) {
1209
+
if (!host->base) {
1213
1210
dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
1214
1211
ret = -EINVAL;
1215
1212
goto probe_free_mem_region;