Skip to content

Commit df48dd0

Browse files
tmlindPierre Ossman
authored andcommitted
mmc: Fix omap compile by replacing dev_name with dma_dev_name
This patch fixes error: drivers/mmc/host/omap.c: In function 'mmc_omap_get_dma_channel': drivers/mmc/host/omap.c:1038: error: called object 'dev_name' is not a function Commit 0691663 adds a function called dev_name. This will cause a name conflict as dev_dbg calls dev_name(((host->mmc)->parent)). This same issue should not affect other drivers as they don't seem to use dev_name with dev_dbg. Thanks to Paul Walmsley <[email protected]> for figuring this one out. Cc: Paul Walmsley <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Signed-off-by: Pierre Ossman <[email protected]>
1 parent 28a4acb commit df48dd0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/mmc/host/omap.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
10031003

10041004
static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data)
10051005
{
1006-
const char *dev_name;
1006+
const char *dma_dev_name;
10071007
int sync_dev, dma_ch, is_read, r;
10081008

10091009
is_read = !(data->flags & MMC_DATA_WRITE);
@@ -1018,21 +1018,21 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data
10181018
if (is_read) {
10191019
if (host->id == 1) {
10201020
sync_dev = OMAP_DMA_MMC_RX;
1021-
dev_name = "MMC1 read";
1021+
dma_dev_name = "MMC1 read";
10221022
} else {
10231023
sync_dev = OMAP_DMA_MMC2_RX;
1024-
dev_name = "MMC2 read";
1024+
dma_dev_name = "MMC2 read";
10251025
}
10261026
} else {
10271027
if (host->id == 1) {
10281028
sync_dev = OMAP_DMA_MMC_TX;
1029-
dev_name = "MMC1 write";
1029+
dma_dev_name = "MMC1 write";
10301030
} else {
10311031
sync_dev = OMAP_DMA_MMC2_TX;
1032-
dev_name = "MMC2 write";
1032+
dma_dev_name = "MMC2 write";
10331033
}
10341034
}
1035-
r = omap_request_dma(sync_dev, dev_name, mmc_omap_dma_cb,
1035+
r = omap_request_dma(sync_dev, dma_dev_name, mmc_omap_dma_cb,
10361036
host, &dma_ch);
10371037
if (r != 0) {
10381038
dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r);

0 commit comments

Comments
 (0)