From d3668679b6bea12ac6ae14ed2240cb84034be3b4 Mon Sep 17 00:00:00 2001 From: Luke Go Date: Thu, 10 Jan 2019 18:29:29 +0900 Subject: [PATCH] ODROID: mmc: Ignore checking the host name. Change-Id: I6c547e3cb1f212b8af24e3cf89edc9595cb2beef --- drivers/amlogic/mmc/emmc_partitions.c | 4 ++++ drivers/mmc/card/block.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/amlogic/mmc/emmc_partitions.c b/drivers/amlogic/mmc/emmc_partitions.c index 12b11e52dedc..72b84e54a193 100644 --- a/drivers/amlogic/mmc/emmc_partitions.c +++ b/drivers/amlogic/mmc/emmc_partitions.c @@ -989,6 +989,7 @@ static int add_emmc_partition(struct gendisk *disk, return 0; } +#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON) static int is_card_emmc(struct mmc_card *card) { struct mmc_host *mmc = card->host; @@ -1000,6 +1001,7 @@ static int is_card_emmc(struct mmc_card *card) return 0; /*return mmc->is_emmc_port;*/ } +#endif static ssize_t emmc_version_get(struct class *class, struct class_attribute *attr, char *buf) @@ -1160,8 +1162,10 @@ int aml_emmc_partition_ops(struct mmc_card *card, struct gendisk *disk) pr_info("Enter %s\n", __func__); +#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON) if (is_card_emmc(card) == 0) /* not emmc, nothing to do */ return 0; +#endif buffer = kmalloc(512, GFP_KERNEL); if (!buffer) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 5374e40798b7..49d913d47c84 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -3023,9 +3023,11 @@ static int mmc_validate_mpt_partition(struct mmc_card *card) char *buf; int ret; +#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON) /* check only if 'card' is eMMC device */ if (strcmp(mmc_hostname(card->host), "emmc")) return -EINVAL; +#endif buf = (char*)kmalloc(1 << card->csd.read_blkbits, GFP_KERNEL); if (buf == NULL)