This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / mmc / mmci.h

diff --git a/drivers/mmc/mmci.h b/drivers/mmc/mmci.h
index ce3a026..6d7eadc 100644 (file)
--- a/drivers/mmc/mmci.h
+++ b/drivers/mmc/mmci.h
@@ -120,7 +120,7 @@
 struct clk;
 
 struct mmci_host {
-       void                    *base;
+       void __iomem            *base;
        struct mmc_request      *mrq;
        struct mmc_command      *cmd;
        struct mmc_data         *data;
@@ -139,7 +139,6 @@ struct mmci_host {
        struct timer_list       timer;
        unsigned int            oldstat;
 
-       struct scatterlist      sg[NR_SG];
        unsigned int            sg_len;
 
        /* pio stuff */
@@ -150,14 +149,11 @@ struct mmci_host {
 
 static inline void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)
 {
-       struct scatterlist *sg = host->sg;
-       struct request *req = data->req;
-
        /*
         * Ideally, we want the higher levels to pass us a scatter list.
         */
-       host->sg_len = blk_rq_map_sg(req->q, req, sg);
-       host->sg_ptr = sg;
+       host->sg_len = data->sg_len;
+       host->sg_ptr = data->sg;
        host->sg_off = 0;
 }
 
@@ -176,8 +172,8 @@ static inline char *mmci_kmap_atomic(struct mmci_host *host, unsigned long *flag
        return kmap_atomic(sg->page, KM_BIO_SRC_IRQ) + sg->offset;
 }
 
-static inline void mmci_kunmap_atomic(struct mmci_host *host, unsigned long *flags)
+static inline void mmci_kunmap_atomic(struct mmci_host *host, void *buffer, unsigned long *flags)
 {
-       kunmap_atomic(host->sg_ptr->page, KM_BIO_SRC_IRQ);
+       kunmap_atomic(buffer, KM_BIO_SRC_IRQ);
        local_irq_restore(*flags);
 }