mmc: dw-mmc: remove complier warning

PATCH In review Jaehoon Chung 2 participants 5 messages Nov 8, 2012 – Nov 20, 2012

Subsystems (2)

MMC, SD and SDIO Synopsys DesignWare MMC/SD/SDIO driver

lore

Share & tools

lore

Jaehoon Chung

author maintainer

2012-11-08 08:35 UTC #0 lore raw

PATCH v3 4/4 mmc: dw-mmc: remove complier warning

drivers/mmc/host/dw_mmc.c: In function 'dw_mci_prepare_command':
drivers/mmc/host/dw_mmc.c:256:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_set_ios':
drivers/mmc/host/dw_mmc.c:805:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_init_slot':
drivers/mmc/host/dw_mmc.c:1849:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_parse_dt':
drivers/mmc/host/dw_mmc.c:2049:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_probe':
drivers/mmc/host/dw_mmc.c:2095:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/host/dw_mmc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

drivers/mmc/host/dw_mmc.c +5 -5

index 9704b09..76c21e4 100644
@@ -253,7 +253,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
 {
 	struct mmc_data	*data;
 	struct dw_mci_slot *slot = mmc_priv(mmc);
-	struct dw_mci_drv_data *drv_data = slot->host->drv_data;
+	const struct dw_mci_drv_data *drv_data = slot->host->drv_data;
 	u32 cmdr;
 	cmd->error = -EINPROGRESS;

@@ -802,7 +802,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
 	struct dw_mci_slot *slot = mmc_priv(mmc);
-	struct dw_mci_drv_data *drv_data = slot->host->drv_data;
+	const struct dw_mci_drv_data *drv_data = slot->host->drv_data;
 	u32 regs;
 
 	switch (ios->bus_width) {

@@ -1846,7 +1846,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
 {
 	struct mmc_host *mmc;
 	struct dw_mci_slot *slot;
-	struct dw_mci_drv_data *drv_data = host->drv_data;
+	const struct dw_mci_drv_data *drv_data = host->drv_data;
 	int ctrl_id, ret;
 	u8 bus_width;

@@ -2046,7 +2046,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 	struct dw_mci_board *pdata;
 	struct device *dev = host->dev;
 	struct device_node *np = dev->of_node;
-	struct dw_mci_drv_data *drv_data = host->drv_data;
+	const struct dw_mci_drv_data *drv_data = host->drv_data;
 	int idx, ret;
 
 	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);

@@ -2092,7 +2092,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 
 int dw_mci_probe(struct dw_mci *host)
 {
-	struct dw_mci_drv_data *drv_data = host->drv_data;
+	const struct dw_mci_drv_data *drv_data = host->drv_data;
 	int width, i, ret = 0;
 	u32 fifo_size;
 	int init_slots = 0;

Signature · 1 line

1.7.4.1

James Hogan

Acked-by on v3 4/4

2012-11-19 12:24 UTC #1 lore raw

Quoted 11 lines · Jaehoon Chung

drivers/mmc/host/dw_mmc.c: In function 'dw_mci_prepare_command':
drivers/mmc/host/dw_mmc.c:256:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_set_ios':
drivers/mmc/host/dw_mmc.c:805:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_init_slot':
drivers/mmc/host/dw_mmc.c:1849:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_parse_dt':
drivers/mmc/host/dw_mmc.c:2049:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_probe':
drivers/mmc/host/dw_mmc.c:2095:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]

Quoted 1 line

Signed-off-by Jaehoon Chung <[email protected]>

Acked-by James Hogan <[email protected]>

Thanks
James

James Hogan

2012-11-19 12:54 UTC #2 lore raw

Quoted 12 lines · James Hogan

Quoted 11 lines · Jaehoon Chung
drivers/mmc/host/dw_mmc.c: In function 'dw_mci_prepare_command':
drivers/mmc/host/dw_mmc.c:256:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_set_ios':
drivers/mmc/host/dw_mmc.c:805:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_init_slot':
drivers/mmc/host/dw_mmc.c:1849:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_parse_dt':
drivers/mmc/host/dw_mmc.c:2049:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_probe':
drivers/mmc/host/dw_mmc.c:2095:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]

Quoted 3 lines

Quoted 1 line
Signed-off-by Jaehoon Chung <[email protected]>
Acked-by James Hogan <[email protected]>

Chris: Is it okay to get this patch into v3.7?

Thanks
James

Jaehoon Chung

author maintainer

2012-11-20 01:40 UTC #3 lore raw

Hi James,

This patch has already merged with Arnd's patch.
He also sent the same patch.

Best Regards,
Jaehoon Chung

Quoted 23 lines · James Hogan

Quoted 12 lines · James Hogan
Quoted 11 lines · Jaehoon Chung
drivers/mmc/host/dw_mmc.c: In function 'dw_mci_prepare_command':
drivers/mmc/host/dw_mmc.c:256:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_set_ios':
drivers/mmc/host/dw_mmc.c:805:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_init_slot':
drivers/mmc/host/dw_mmc.c:1849:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_parse_dt':
drivers/mmc/host/dw_mmc.c:2049:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_probe':
drivers/mmc/host/dw_mmc.c:2095:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
Quoted 3 lines
Quoted 1 line
Signed-off-by Jaehoon Chung <[email protected]>
Acked-by James Hogan <[email protected]>
Chris: Is it okay to get this patch into v3.7?
Thanks
James

James Hogan

2012-11-20 09:06 UTC #4 lore raw

Quoted 4 lines · Jaehoon Chung

Hi James,
This patch has already merged with Arnd's patch.
He also sent the same patch.

Ah yes :-)

Thanks
James

Quoted 29 lines

Best Regards,
Jaehoon Chung
Quoted 23 lines · James Hogan
Quoted 12 lines · James Hogan
Quoted 11 lines · Jaehoon Chung
drivers/mmc/host/dw_mmc.c: In function 'dw_mci_prepare_command':
drivers/mmc/host/dw_mmc.c:256:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_set_ios':
drivers/mmc/host/dw_mmc.c:805:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_init_slot':
drivers/mmc/host/dw_mmc.c:1849:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_parse_dt':
drivers/mmc/host/dw_mmc.c:2049:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] drivers/mmc/host/dw_mmc.c: In function 'dw_mci_probe':
drivers/mmc/host/dw_mmc.c:2095:37: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
Quoted 3 lines
Quoted 1 line
Signed-off-by Jaehoon Chung <[email protected]>
Acked-by James Hogan <[email protected]>
Chris: Is it okay to get this patch into v3.7?
Thanks
James