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

Commit 5a0276b7 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: at91_mci: remove whitespace at the end of lines
  mmc: reorganize bounce buffer init
  wbsd: fix section mismatch warnings
parents be12014d 37b758e8

drivers/mmc/card/queue.c

+7 −7
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 
	struct mmc_host *host = card->host;

	u64 limit = BLK_BOUNCE_HIGH;

	int ret;

	unsigned int bouncesz;



	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)

		limit = *mmc_dev(host)->dma_mask;
@@ -134,6 +133,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 


#ifdef CONFIG_MMC_BLOCK_BOUNCE

	if (host->max_hw_segs == 1) {

		unsigned int bouncesz;



		bouncesz = MMC_QUEUE_BOUNCESZ;



		if (bouncesz > host->max_req_size)
@@ -156,14 +157,14 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 
				GFP_KERNEL);

			if (!mq->sg) {

				ret = -ENOMEM;

				goto free_bounce_buf;

				goto cleanup_queue;

			}



			mq->bounce_sg = kmalloc(sizeof(struct scatterlist) *

				bouncesz / 512, GFP_KERNEL);

			if (!mq->bounce_sg) {

				ret = -ENOMEM;

				goto free_sg;

				goto cleanup_queue;

			}

		}

	}
@@ -197,14 +198,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 
 	if (mq->bounce_sg)

 		kfree(mq->bounce_sg);

 	mq->bounce_sg = NULL;

 free_sg:

 cleanup_queue:

 	if (mq->sg)

		kfree(mq->sg);

	mq->sg = NULL;

 free_bounce_buf:

	if (mq->bounce_buf)

		kfree(mq->bounce_buf);

	mq->bounce_buf = NULL;

 cleanup_queue:

	blk_cleanup_queue(mq->queue);

	return ret;

}

drivers/mmc/host/wbsd.c

+5 −5
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ static int __devinit wbsd_alloc_mmc(struct device *dev) 
	return 0;

}



static void __devexit wbsd_free_mmc(struct device *dev)

static void wbsd_free_mmc(struct device *dev)

{

	struct mmc_host *mmc;

	struct wbsd_host *host;
@@ -1358,7 +1358,7 @@ static int __devinit wbsd_request_region(struct wbsd_host *host, int base) 
	return 0;

}



static void __devexit wbsd_release_regions(struct wbsd_host *host)

static void wbsd_release_regions(struct wbsd_host *host)

{

	if (host->base)

		release_region(host->base, 8);
@@ -1434,7 +1434,7 @@ static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma) 
		"Falling back on FIFO.\n", dma);

}



static void __devexit wbsd_release_dma(struct wbsd_host *host)

static void wbsd_release_dma(struct wbsd_host *host)

{

	if (host->dma_addr) {

		dma_unmap_single(mmc_dev(host->mmc), host->dma_addr,
@@ -1484,7 +1484,7 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq) 
	return 0;

}



static void __devexit wbsd_release_irq(struct wbsd_host *host)

static void  wbsd_release_irq(struct wbsd_host *host)

{

	if (!host->irq)

		return;
@@ -1535,7 +1535,7 @@ static int __devinit wbsd_request_resources(struct wbsd_host *host, 
 * Release all resources for the host.

 */



static void __devexit wbsd_release_resources(struct wbsd_host *host)

static void wbsd_release_resources(struct wbsd_host *host)

{

	wbsd_release_dma(host);

	wbsd_release_irq(host);

drivers/mmc/host/at91_mci.c

+4 −4

File changed.

Contains only whitespace changes.