Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d27d4e2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  mmc: orphan subsystem
  imxmmc: Remove unnecessary semicolons
  cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG
  sdhci: use SG_MITER_TO_SG/SG_MITER_FROM_SG
  lib/scatterlist: add a flags to signalize mapping direction
parents dbe63a2c 3822a0e3

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -3420,8 +3420,7 @@ S: Supported 
F:	drivers/mfd/



MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM

M:	Pierre Ossman <pierre@ossman.eu>

S:	Maintained

S:	Orphan

F:	drivers/mmc/

F:	include/linux/mmc/

drivers/misc/cb710/sgbuf2.c

+0 −4
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static void sg_dwiter_write_slow(struct sg_mapping_iter *miter, uint32_t data) 
		if (!left)

			return;

		addr += len;

		flush_kernel_dcache_page(miter->page);

	} while (sg_dwiter_next(miter));

}
@@ -142,9 +141,6 @@ void cb710_sg_dwiter_write_next_block(struct sg_mapping_iter *miter, uint32_t da 
			return;

	} else

		sg_dwiter_write_slow(miter, data);



	if (miter->length == miter->consumed)

		flush_kernel_dcache_page(miter->page);

}

EXPORT_SYMBOL_GPL(cb710_sg_dwiter_write_next_block);

drivers/mmc/host/cb710-mmc.c

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int cb710_mmc_receive(struct cb710_slot *slot, struct mmc_data *data) 
	if (unlikely(data->blksz & 15 && (data->blocks != 1 || data->blksz != 8)))

		return -EINVAL;



	sg_miter_start(&miter, data->sg, data->sg_len, 0);

	sg_miter_start(&miter, data->sg, data->sg_len, SG_MITER_TO_SG);



	cb710_modify_port_8(slot, CB710_MMC_CONFIG2_PORT,

		15, CB710_MMC_C2_READ_PIO_SIZE_MASK);
@@ -307,7 +307,7 @@ static int cb710_mmc_receive(struct cb710_slot *slot, struct mmc_data *data) 
			goto out;

	}

out:

	cb710_sg_miter_stop_writing(&miter);

	sg_miter_stop(&miter);

	return err;

}
@@ -322,7 +322,7 @@ static int cb710_mmc_send(struct cb710_slot *slot, struct mmc_data *data) 
	if (unlikely(data->blocks > 1 && data->blksz & 15))

		return -EINVAL;



	sg_miter_start(&miter, data->sg, data->sg_len, 0);

	sg_miter_start(&miter, data->sg, data->sg_len, SG_MITER_FROM_SG);



	cb710_modify_port_8(slot, CB710_MMC_CONFIG2_PORT,

		0, CB710_MMC_C2_READ_PIO_SIZE_MASK);

drivers/mmc/host/imxmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static irqreturn_t imxmci_irq(int irq, void *devid) 
	set_bit(IMXMCI_PEND_STARTED_b, &host->pending_events);

	tasklet_schedule(&host->tasklet);



	return IRQ_RETVAL(handled);;

	return IRQ_RETVAL(handled);

}



static void imxmci_tasklet_fnc(unsigned long data)

drivers/mmc/host/sdhci.c

+8 −2
Original line number Diff line number Diff line
@@ -773,8 +773,14 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) 
	}



	if (!(host->flags & SDHCI_REQ_USE_DMA)) {

		sg_miter_start(&host->sg_miter,

			data->sg, data->sg_len, SG_MITER_ATOMIC);

		int flags;



		flags = SG_MITER_ATOMIC;

		if (host->data->flags & MMC_DATA_READ)

			flags |= SG_MITER_TO_SG;

		else

			flags |= SG_MITER_FROM_SG;

		sg_miter_start(&host->sg_miter, data->sg, data->sg_len, flags);

		host->blocks = data->blocks;

	}