mmc: mmci: add validate_data callback

This patch adds validate_data callback at mmci_host_ops
to check specific constraints of variant.
Move mmci_validate_data function to regroup mmci_host_ops interfaces.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 3d4431babc8ccf61d5f639549d19317b5e5b3a11..91ef2ede41c52a454c38553f33ef8788e83ccf26 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -239,24 +239,6 @@ static int mmci_card_busy(struct mmc_host *mmc)
        return busy;
 }
 
-/*
- * Validate mmc prerequisites
- */
-static int mmci_validate_data(struct mmci_host *host,
-                             struct mmc_data *data)
-{
-       if (!data)
-               return 0;
-
-       if (!is_power_of_2(data->blksz)) {
-               dev_err(mmc_dev(host->mmc),
-                       "unsupported block size (%d bytes)\n", data->blksz);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
 static void mmci_reg_delay(struct mmci_host *host)
 {
        /*
@@ -392,6 +374,27 @@ void mmci_dma_setup(struct mmci_host *host)
        host->use_dma = true;
 }
 
+/*
+ * Validate mmc prerequisites
+ */
+static int mmci_validate_data(struct mmci_host *host,
+                             struct mmc_data *data)
+{
+       if (!data)
+               return 0;
+
+       if (!is_power_of_2(data->blksz)) {
+               dev_err(mmc_dev(host->mmc),
+                       "unsupported block size (%d bytes)\n", data->blksz);
+               return -EINVAL;
+       }
+
+       if (host->ops && host->ops->validate_data)
+               return host->ops->validate_data(host, data);
+
+       return 0;
+}
+
 int mmci_prep_data(struct mmci_host *host, struct mmc_data *data, bool next)
 {
        int err;

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index bcf3e8b901d72405f505fe85bec443492fe39f86..ed59baf37f0fc0cce5e65d056b7f63029cc52d46 100644 (file)
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -273,6 +273,7 @@ struct variant_data {
 
 /* mmci variant callbacks */
 struct mmci_host_ops {
+       int (*validate_data)(struct mmci_host *host, struct mmc_data *data);
        int (*prep_data)(struct mmci_host *host, struct mmc_data *data,
                         bool next);
        void (*unprep_data)(struct mmci_host *host, struct mmc_data *data,