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: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
index 0f81464fa824f6ed7e802d5f7ab98e1ce7d67d09..7e3ed1aeada2b59d6e3db2b9189d985d9a2cc958 100644 (file)
--- a/drivers/mmc/core/Makefile
+++ b/drivers/mmc/core/Makefile
@@ -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

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index cd909aecfdedfb2cf7b91657bb26736ec7e42b59..6f3a5ff8559057cfffa0bb1ddca846bef93ee38f 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -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");

diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h
index 95e8fc54eb21f28631db6962bb2b08f2baf6e48c..f06cd91964ce970b0c623dd662c335eb0fc4dadb 100644 (file)
--- a/drivers/mmc/core/card.h
+++ b/drivers/mmc/core/card.h
@@ -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

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index ad1089c713e526d3cca7a03640f7da08ef5746a8..f830970958e6796fcd9fb0fa32e16e402f73c360 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -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

diff --git a/drivers/mmc/core/quirks.c b/drivers/mmc/core/quirks.h
similarity index 90%
rename from drivers/mmc/core/quirks.c
rename to drivers/mmc/core/quirks.h
index bf25a9c888630afdc112f9b5f06023816d5896f1..1e56ec4d408525f4faf45f727f7e5f25eb14ce85 100644 (file)
--- a/drivers/mmc/core/quirks.c
+++ b/drivers/mmc/core/quirks.h
@@ -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);

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index a64a8709ec72327eb171715f82a4c03bb93a0b00..f092a55c5064b9905fc4c69aa9b8ab6abe8ba787 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -23,6 +23,7 @@
 #include "card.h"
 #include "host.h"
 #include "bus.h"
+#include "quirks.h"
 #include "sd.h"
 #include "sdio_bus.h"
 #include "mmc_ops.h"