1 files changed, 1 insertions, 34 deletions

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index d77062e5e3af..7cb24ab1eecc 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -171,42 +171,9 @@ struct mmci_host {
         struct timer_list       timer;
         unsigned int            oldstat;
 
-        unsigned int            sg_len;
-
         /* pio stuff */
-        struct scatterlist      *sg_ptr;
-        unsigned int            sg_off;
+        struct sg_mapping_iter  sg_miter;
         unsigned int            size;
         struct regulator        *vcc;
 };
 
-static inline void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)
-{
-        /*
-         * Ideally, we want the higher levels to pass us a scatter list.
-         */
-        host->sg_len = data->sg_len;
-        host->sg_ptr = data->sg;
-        host->sg_off = 0;
-}
-
-static inline int mmci_next_sg(struct mmci_host *host)
-{
-        host->sg_ptr++;
-        host->sg_off = 0;
-        return --host->sg_len;
-}
-
-static inline char *mmci_kmap_atomic(struct mmci_host *host, unsigned long *flags)
-{
-        struct scatterlist *sg = host->sg_ptr;
-
-        local_irq_save(*flags);
-        return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
-}
-
-static inline void mmci_kunmap_atomic(struct mmci_host *host, void *buffer, unsigned long *flags)
-{
-        kunmap_atomic(buffer, KM_BIO_SRC_IRQ);
-        local_irq_restore(*flags);
-}