Commit 28fc64af authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: core: change quirks.c to be a header file 



Rename quirks.c to quirks.h, and include it for
individual C files which need it.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4e03f628

drivers/mmc/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ mmc_core-y := core.o bus.o host.o \ 
				   mmc.o mmc_ops.o sd.o sd_ops.o \

				   sdio.o sdio_ops.o sdio_bus.o \

				   sdio_cis.o sdio_io.o sdio_irq.o \

				   quirks.o slot-gpio.o

				   slot-gpio.o

mmc_core-$(CONFIG_OF)		+= pwrseq.o

obj-$(CONFIG_PWRSEQ_SIMPLE)	+= pwrseq_simple.o

obj-$(CONFIG_PWRSEQ_SD8787)	+= pwrseq_sd8787.o

drivers/mmc/core/block.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "host.h"

#include "bus.h"

#include "mmc_ops.h"

#include "quirks.h"

#include "sd_ops.h"



MODULE_ALIAS("mmc:block");

drivers/mmc/core/card.h

+0 −2
Original line number Diff line number Diff line
@@ -218,6 +218,4 @@ static inline int mmc_card_broken_hpi(const struct mmc_card *c) 
	return c->quirks & MMC_QUIRK_BROKEN_HPI;

}



void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table);



#endif

drivers/mmc/core/mmc.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "host.h"

#include "bus.h"

#include "mmc_ops.h"

#include "quirks.h"

#include "sd_ops.h"



#define DEFAULT_CMD6_TIMEOUT_MS	500

drivers/mmc/core/quirks.c→drivers/mmc/core/quirks.h

+2 −6
Original line number Diff line number Diff line
@@ -9,10 +9,6 @@ 
 *

 */



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/export.h>

#include <linux/mmc/card.h>

#include <linux/mmc/sdio_ids.h>



#include "card.h"
@@ -53,7 +49,8 @@ static const struct mmc_fixup mmc_fixup_methods[] = { 
	END_FIXUP

};



void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table)

static inline void mmc_fixup_device(struct mmc_card *card,

				    const struct mmc_fixup *table)

{

	const struct mmc_fixup *f;

	u64 rev = cid_rev_card(card);
@@ -82,4 +79,3 @@ void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table) 
		}

	}

}
 
EXPORT_SYMBOL(mmc_fixup_device);