mmc: renesas-sdhi: improve checkpatch cleanness (2fe35968) · Commits · jan.koester / Linux

drivers/mmc/host/renesas_sdhi_core.c

+22 −21

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,8 @@
	#define SDHI_VER_GEN3_SD 0xcc10		#define SDHI_VER_GEN3_SD 0xcc10
	#define SDHI_VER_GEN3_SDMMC 0xcd10		#define SDHI_VER_GEN3_SDMMC 0xcd10

	#define host_to_priv(host) container_of((host)->pdata, struct renesas_sdhi, mmc_data)		#define host_to_priv(host) \
			container_of((host)->pdata, struct renesas_sdhi, mmc_data)

	struct renesas_sdhi {		struct renesas_sdhi {
	struct clk *clk;		struct clk *clk;
	@@ -94,6 +95,7 @@ static int renesas_sdhi_clk_enable(struct tmio_mmc_host *host)
	struct mmc_host *mmc = host->mmc;		struct mmc_host *mmc = host->mmc;
	struct renesas_sdhi *priv = host_to_priv(host);		struct renesas_sdhi *priv = host_to_priv(host);
	int ret = clk_prepare_enable(priv->clk);		int ret = clk_prepare_enable(priv->clk);

	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

	@@ -175,7 +177,8 @@ static int renesas_sdhi_card_busy(struct mmc_host *mmc)
	{		{
	struct tmio_mmc_host *host = mmc_priv(mmc);		struct tmio_mmc_host *host = mmc_priv(mmc);

	return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_DAT0);		return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) &
			TMIO_STAT_DAT0);
	}		}

	static int renesas_sdhi_start_signal_voltage_switch(struct mmc_host *mmc,		static int renesas_sdhi_start_signal_voltage_switch(struct mmc_host *mmc,
	@@ -318,9 +321,9 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host)
	tap_start = 0;		tap_start = 0;
	tap_end = 0;		tap_end = 0;
	for (i = 0; i < host->tap_num * 2; i++) {		for (i = 0; i < host->tap_num * 2; i++) {
	if (test_bit(i, host->taps))		if (test_bit(i, host->taps)) {
	ntap++;		ntap++;
	else {		} else {
	if (ntap > tap_cnt) {		if (ntap > tap_cnt) {
	tap_start = i - ntap;		tap_start = i - ntap;
	tap_end = i - 1;		tap_end = i - 1;
	@@ -352,7 +355,6 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host)
	return 0;		return 0;
	}		}


	static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host)		static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host)
	{		{
	struct renesas_sdhi *priv = host_to_priv(host);		struct renesas_sdhi *priv = host_to_priv(host);
	@@ -414,8 +416,7 @@ static int renesas_sdhi_wait_idle(struct tmio_mmc_host *host)

	static int renesas_sdhi_write16_hook(struct tmio_mmc_host *host, int addr)		static int renesas_sdhi_write16_hook(struct tmio_mmc_host *host, int addr)
	{		{
	switch (addr)		switch (addr) {
	{
	case CTL_SD_CMD:		case CTL_SD_CMD:
	case CTL_STOP_INTERNAL_ACTION:		case CTL_STOP_INTERNAL_ACTION:
	case CTL_XFER_BLK_COUNT:		case CTL_XFER_BLK_COUNT:
	@@ -460,20 +461,23 @@ static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable)
	int renesas_sdhi_probe(struct platform_device *pdev,		int renesas_sdhi_probe(struct platform_device *pdev,
	const struct tmio_mmc_dma_ops *dma_ops)		const struct tmio_mmc_dma_ops *dma_ops)
	{		{
	const struct renesas_sdhi_of_data *of_data = of_device_get_match_data( &pdev->dev);
	struct renesas_sdhi *priv;
	struct tmio_mmc_data *mmc_data;
	struct tmio_mmc_data *mmd = pdev->dev.platform_data;		struct tmio_mmc_data *mmd = pdev->dev.platform_data;
			const struct renesas_sdhi_of_data *of_data;
			struct tmio_mmc_data *mmc_data;
			struct tmio_mmc_dma *dma_priv;
	struct tmio_mmc_host *host;		struct tmio_mmc_host *host;
			struct renesas_sdhi *priv;
	struct resource *res;		struct resource *res;
	int irq, ret, i;		int irq, ret, i;
	struct tmio_mmc_dma *dma_priv;
			of_data = of_device_get_match_data(&pdev->dev);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
	if (!res)		if (!res)
	return -EINVAL;		return -EINVAL;

	priv = devm_kzalloc(&pdev->dev, sizeof(struct renesas_sdhi), GFP_KERNEL);		priv = devm_kzalloc(&pdev->dev, sizeof(struct renesas_sdhi),
			GFP_KERNEL);
	if (!priv)		if (!priv)
	return -ENOMEM;		return -ENOMEM;

	@@ -516,7 +520,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,
	goto eprobe;		goto eprobe;
	}		}


	if (of_data) {		if (of_data) {
	mmc_data->flags \|= of_data->tmio_flags;		mmc_data->flags \|= of_data->tmio_flags;
	mmc_data->ocr_mask = of_data->tmio_ocr_mask;		mmc_data->ocr_mask = of_data->tmio_ocr_mask;
	@@ -566,9 +569,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
	*/		*/
	mmc_data->flags \|= TMIO_MMC_SDIO_IRQ;		mmc_data->flags \|= TMIO_MMC_SDIO_IRQ;

	/*		/* All SDHI have CMD12 control bit */
	* All SDHI have CMD12 controll bit
	*/
	mmc_data->flags \|= TMIO_MMC_HAVE_CMD12_CTRL;		mmc_data->flags \|= TMIO_MMC_HAVE_CMD12_CTRL;

	/* All SDHI have SDIO status bits which must be 1 */		/* All SDHI have SDIO status bits which must be 1 */

drivers/mmc/host/renesas_sdhi_sys_dmac.c

+14 −11

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,6 @@ static const struct of_device_id renesas_sdhi_sys_dmac_of_match[] = {
	};		};
	MODULE_DEVICE_TABLE(of, renesas_sdhi_sys_dmac_of_match);		MODULE_DEVICE_TABLE(of, renesas_sdhi_sys_dmac_of_match);


	static void renesas_sdhi_sys_dmac_enable_dma(struct tmio_mmc_host *host,		static void renesas_sdhi_sys_dmac_enable_dma(struct tmio_mmc_host *host,
	bool enable)		bool enable)
	{		{
	@@ -196,8 +195,8 @@ static void renesas_sdhi_sys_dmac_start_dma_rx(struct tmio_mmc_host *host)

	ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);		ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);
	if (ret > 0)		if (ret > 0)
	desc = dmaengine_prep_slave_sg(chan, sg, ret,		desc = dmaengine_prep_slave_sg(chan, sg, ret, DMA_DEV_TO_MEM,
	DMA_DEV_TO_MEM, DMA_CTRL_ACK);		DMA_CTRL_ACK);

	if (desc) {		if (desc) {
	reinit_completion(&host->dma_dataend);		reinit_completion(&host->dma_dataend);
	@@ -265,6 +264,7 @@ static void renesas_sdhi_sys_dmac_start_dma_tx(struct tmio_mmc_host *host)
	if (!aligned) {		if (!aligned) {
	unsigned long flags;		unsigned long flags;
	void *sg_vaddr = tmio_mmc_kmap_atomic(sg, &flags);		void *sg_vaddr = tmio_mmc_kmap_atomic(sg, &flags);

	sg_init_one(&host->bounce_sg, host->bounce_buf, sg->length);		sg_init_one(&host->bounce_sg, host->bounce_buf, sg->length);
	memcpy(host->bounce_buf, sg_vaddr, host->bounce_sg.length);		memcpy(host->bounce_buf, sg_vaddr, host->bounce_sg.length);
	tmio_mmc_kunmap_atomic(sg, &flags, sg_vaddr);		tmio_mmc_kunmap_atomic(sg, &flags, sg_vaddr);
	@@ -274,8 +274,8 @@ static void renesas_sdhi_sys_dmac_start_dma_tx(struct tmio_mmc_host *host)

	ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);		ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);
	if (ret > 0)		if (ret > 0)
	desc = dmaengine_prep_slave_sg(chan, sg, ret,		desc = dmaengine_prep_slave_sg(chan, sg, ret, DMA_MEM_TO_DEV,
	DMA_MEM_TO_DEV, DMA_CTRL_ACK);		DMA_CTRL_ACK);

	if (desc) {		if (desc) {
	reinit_completion(&host->dma_dataend);		reinit_completion(&host->dma_dataend);
	@@ -372,7 +372,8 @@ static void renesas_sdhi_sys_dmac_request_dma(struct tmio_mmc_host *host,
	return;		return;

	cfg.direction = DMA_MEM_TO_DEV;		cfg.direction = DMA_MEM_TO_DEV;
	cfg.dst_addr = res->start + (CTL_SD_DATA_PORT << host->bus_shift);		cfg.dst_addr = res->start +
			(CTL_SD_DATA_PORT << host->bus_shift);
	cfg.dst_addr_width = host->dma->dma_buswidth;		cfg.dst_addr_width = host->dma->dma_buswidth;
	if (!cfg.dst_addr_width)		if (!cfg.dst_addr_width)
	cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;		cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
	@@ -428,11 +429,13 @@ static void renesas_sdhi_sys_dmac_release_dma(struct tmio_mmc_host *host)
	{		{
	if (host->chan_tx) {		if (host->chan_tx) {
	struct dma_chan *chan = host->chan_tx;		struct dma_chan *chan = host->chan_tx;

	host->chan_tx = NULL;		host->chan_tx = NULL;
	dma_release_channel(chan);		dma_release_channel(chan);
	}		}
	if (host->chan_rx) {		if (host->chan_rx) {
	struct dma_chan *chan = host->chan_rx;		struct dma_chan *chan = host->chan_rx;

	host->chan_rx = NULL;		host->chan_rx = NULL;
	dma_release_channel(chan);		dma_release_channel(chan);
	}		}

drivers/mmc/host/renesas_sdhi.h

+1 −1

File changed.

Contains only whitespace changes.