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

Commit 98ac2162 authored by Pierre Ossman's avatar Pierre Ossman
Browse files

mmc: Move queue functions to mmc_block 



The mmc block queue functions are tailored for the mmc_block
driver, so move those functions into that module.

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 29041dbe

drivers/mmc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_MMC) += mmc_core.o 
# Media drivers

#

obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o

mmc_block-objs			:= block.o queue.o



#

# Host drivers
@@ -26,7 +27,6 @@ obj-$(CONFIG_MMC_AT91) += at91_mci.o 
obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o



mmc_core-y := mmc.o mmc_sysfs.o

mmc_core-$(CONFIG_BLOCK) += mmc_queue.o



ifeq ($(CONFIG_MMC_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

drivers/mmc/mmc_block.c→drivers/mmc/block.c

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Block driver for media (i.e., flash cards)

 *

 * Copyright 2002 Hewlett-Packard Company

 * Copyright 2005-2007 Pierre Ossman

 *

 * Use consistent with the GNU GPL is permitted,

 * provided that this copyright notice is
@@ -37,7 +38,7 @@ 
#include <asm/system.h>

#include <asm/uaccess.h>



#include "mmc_queue.h"

#include "queue.h"



/*

 * max 8 partitions per card

drivers/mmc/mmc_queue.c→drivers/mmc/queue.c

+4 −5
Original line number Diff line number Diff line 
/*

 *  linux/drivers/mmc/mmc_queue.c

 *  linux/drivers/mmc/queue.c

 *

 *  Copyright (C) 2003 Russell King, All Rights Reserved.

 *  Copyright 2006-2007 Pierre Ossman

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -14,7 +15,7 @@ 


#include <linux/mmc/card.h>

#include <linux/mmc/host.h>

#include "mmc_queue.h"

#include "queue.h"



#define MMC_QUEUE_SUSPENDED	(1 << 0)
@@ -179,7 +180,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 
	blk_cleanup_queue(mq->queue);

	return ret;

}

EXPORT_SYMBOL(mmc_init_queue);



void mmc_cleanup_queue(struct mmc_queue *mq)

{
@@ -226,7 +226,6 @@ void mmc_queue_suspend(struct mmc_queue *mq) 
		down(&mq->thread_sem);

	}

}

EXPORT_SYMBOL(mmc_queue_suspend);



/**

 * mmc_queue_resume - resume a previously suspended MMC request queue
@@ -247,4 +246,4 @@ void mmc_queue_resume(struct mmc_queue *mq) 
		spin_unlock_irqrestore(q->queue_lock, flags);

	}

}

EXPORT_SYMBOL(mmc_queue_resume);

drivers/mmc/mmc_queue.h→drivers/mmc/queue.h

+0 −0

File moved.

View file