Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: sh_mmcif: use sh_mmcif_xxx prefix for all functions

Current sh_mmcif driver is using sh_mmcif_xxx and mmcif_xxx
for functions. This patch used sh_mmcif_xxx for all functions.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Kuninori Morimoto and committed by
Ulf Hansson
1b1a694d 585c3a5a

+13 -13
+13 -13
drivers/mmc/host/sh_mmcif.c
··· 205 205 #define CLKDEV_MMC_DATA 20000000 /* 20MHz */ 206 206 #define CLKDEV_INIT 400000 /* 400 KHz */ 207 207 208 - enum mmcif_state { 208 + enum sh_mmcif_state { 209 209 STATE_IDLE, 210 210 STATE_REQUEST, 211 211 STATE_IOS, 212 212 STATE_TIMEOUT, 213 213 }; 214 214 215 - enum mmcif_wait_for { 215 + enum sh_mmcif_wait_for { 216 216 MMCIF_WAIT_FOR_REQUEST, 217 217 MMCIF_WAIT_FOR_CMD, 218 218 MMCIF_WAIT_FOR_MREAD, ··· 237 237 void __iomem *addr; 238 238 u32 *pio_ptr; 239 239 spinlock_t lock; /* protect sh_mmcif_host::state */ 240 - enum mmcif_state state; 241 - enum mmcif_wait_for wait_for; 240 + enum sh_mmcif_state state; 241 + enum sh_mmcif_wait_for wait_for; 242 242 struct delayed_work timeout_work; 243 243 size_t blocksize; 244 244 int sg_idx; ··· 256 256 bool dma_active; 257 257 }; 258 258 259 - static const struct of_device_id mmcif_of_match[] = { 259 + static const struct of_device_id sh_mmcif_of_match[] = { 260 260 { .compatible = "renesas,sh-mmcif" }, 261 261 { } 262 262 }; 263 - MODULE_DEVICE_TABLE(of, mmcif_of_match); 263 + MODULE_DEVICE_TABLE(of, sh_mmcif_of_match); 264 264 265 265 #define sh_mmcif_host_to_dev(host) (&host->pd->dev) 266 266 ··· 276 276 writel(~val & readl(host->addr + reg), host->addr + reg); 277 277 } 278 278 279 - static void mmcif_dma_complete(void *arg) 279 + static void sh_mmcif_dma_complete(void *arg) 280 280 { 281 281 struct sh_mmcif_host *host = arg; 282 282 struct mmc_request *mrq = host->mrq; ··· 310 310 } 311 311 312 312 if (desc) { 313 - desc->callback = mmcif_dma_complete; 313 + desc->callback = sh_mmcif_dma_complete; 314 314 desc->callback_param = host; 315 315 cookie = dmaengine_submit(desc); 316 316 sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAREN); ··· 360 360 } 361 361 362 362 if (desc) { 363 - desc->callback = mmcif_dma_complete; 363 + desc->callback = sh_mmcif_dma_complete; 364 364 desc->callback_param = host; 365 365 cookie = dmaengine_submit(desc); 366 366 sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAWEN); ··· 1327 1327 if (!host->dma_active) 1328 1328 return IRQ_WAKE_THREAD; 1329 1329 else if (host->sd_error) 1330 - mmcif_dma_complete(host); 1330 + sh_mmcif_dma_complete(host); 1331 1331 } else { 1332 1332 dev_dbg(dev, "Unexpected IRQ 0x%x\n", state); 1333 1333 } ··· 1335 1335 return IRQ_HANDLED; 1336 1336 } 1337 1337 1338 - static void mmcif_timeout_work(struct work_struct *work) 1338 + static void sh_mmcif_timeout_work(struct work_struct *work) 1339 1339 { 1340 1340 struct delayed_work *d = container_of(work, struct delayed_work, work); 1341 1341 struct sh_mmcif_host *host = container_of(d, struct sh_mmcif_host, timeout_work); ··· 1481 1481 if (ret < 0) 1482 1482 goto err_clk; 1483 1483 1484 - INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work); 1484 + INIT_DELAYED_WORK(&host->timeout_work, sh_mmcif_timeout_work); 1485 1485 1486 1486 sh_mmcif_sync_reset(host); 1487 1487 sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); ··· 1587 1587 .driver = { 1588 1588 .name = DRIVER_NAME, 1589 1589 .pm = &sh_mmcif_dev_pm_ops, 1590 - .of_match_table = mmcif_of_match, 1590 + .of_match_table = sh_mmcif_of_match, 1591 1591 }, 1592 1592 }; 1593 1593