[PATCH 3/4] mci: dw_mmc: Delete devname in platform_data

Trent Piepho tpiepho at kymetacorp.com
Wed Nov 18 13:12:53 PST 2015


Nothing used it.

Also delete the local mci alias pointer to host->mci in
dw_mmc_probe().  It only saved a few characters and all the references
but one are using host->mci.

Signed-off-by: Trent Piepho <tpiepho at kymetacorp.com>
---
 drivers/mci/dw_mmc.c           | 5 +----
 include/platform_data/dw_mmc.h | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c
index f8ff389..18ddd16 100644
--- a/drivers/mci/dw_mmc.c
+++ b/drivers/mci/dw_mmc.c
@@ -676,11 +676,9 @@ static int dw_mmc_detect(struct device_d *dev)
 static int dw_mmc_probe(struct device_d *dev)
 {
 	struct dwmci_host *host;
-	struct mci_host *mci;
 	struct dw_mmc_platform_data *pdata = dev->platform_data;
 
 	host = xzalloc(sizeof(*host));
-	mci = &host->mci;
 
 	host->clk_biu = clk_get(dev, "biu");
 	if (IS_ERR(host->clk_biu))
@@ -710,14 +708,13 @@ static int dw_mmc_probe(struct device_d *dev)
 	host->mci.host_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
 
 	if (pdata) {
-		mci->devname = pdata->devname;
 		host->ciu_div = pdata->ciu_div;
 		host->mci.host_caps &= ~MMC_CAP_BIT_DATA_MASK;
 		host->mci.host_caps |= pdata->bus_width_caps;
 	} else if (dev->device_node) {
 		const char *alias = of_alias_get(dev->device_node);
 		if (alias)
-			mci->devname = xstrdup(alias);
+			host->mci.devname = xstrdup(alias);
 		of_property_read_u32(dev->device_node, "dw-mshc-ciu-div",
 				&host->ciu_div);
 	}
diff --git a/include/platform_data/dw_mmc.h b/include/platform_data/dw_mmc.h
index ce1b339..4325a4f 100644
--- a/include/platform_data/dw_mmc.h
+++ b/include/platform_data/dw_mmc.h
@@ -2,7 +2,6 @@
 #define __INCLUDE_PLATFORM_DATA_DW_MMC_H
 
 struct dw_mmc_platform_data {
-	char *devname;
 	unsigned int bus_width_caps;
 	int ciu_div;
 };
-- 
1.8.3.1




More information about the barebox mailing list