Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 22cb7d334e296288e53057467dfee26858275516

Authored by Pantelis Antoniou
1 parent ab769f227f
Exists in v2017.01-smarct4x and in 48 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

mmc: Convert mmc struct's name array to a pointer 

Using an array is pointless; even more pointless (and scary) is using
sprintf to fill it without a format string.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>

Showing 16 changed files with 16 additions and 16 deletions Side-by-side Diff

drivers/mmc/arm_pl180_mmci.c
Diff comments   View file @ 22cb7d3
... ... @@ -365,7 +365,7 @@
365 365 /* Disable mmc interrupts */
366 366 sdi_u32 = readl(&host->base->mask0) & ~SDI_MASK0_MASK;
367 367 writel(sdi_u32, &host->base->mask0);
368   - strncpy(dev->name, host->name, sizeof(dev->name));
  368 + dev->name = host->name;
369 369 dev->ops = &arm_pl180_mmci_ops;
370 370 dev->host_caps = host->caps;
371 371 dev->voltages = host->voltages;
drivers/mmc/bfin_sdh.c
Diff comments   View file @ 22cb7d3
... ... @@ -288,7 +288,7 @@
288 288  
289 289 if (!mmc)
290 290 return -ENOMEM;
291   - sprintf(mmc->name, "Blackfin SDH");
  291 + mmc->name = "Blackfin SDH";
292 292 mmc->ops = &bfin_mmc_ops;
293 293 mmc->host_caps = MMC_MODE_4BIT;
294 294  
drivers/mmc/davinci_mmc.c
Diff comments   View file @ 22cb7d3
... ... @@ -379,7 +379,7 @@
379 379 mmc = malloc(sizeof(struct mmc));
380 380 memset(mmc, 0, sizeof(struct mmc));
381 381  
382   - sprintf(mmc->name, "davinci");
  382 + mmc->name = "davinci";
383 383 mmc->priv = host;
384 384 mmc->ops = &dmmc_ops;
385 385 mmc->f_min = 200000;
drivers/mmc/dw_mmc.c
Diff comments   View file @ 22cb7d3
... ... @@ -363,7 +363,7 @@
363 363 mmc->priv = host;
364 364 host->mmc = mmc;
365 365  
366   - sprintf(mmc->name, "%s", host->name);
  366 + mmc->name = host->name;
367 367 mmc->ops = &dwmci_ops;
368 368 mmc->f_min = min_clk;
369 369 mmc->f_max = max_clk;
drivers/mmc/fsl_esdhc.c
Diff comments   View file @ 22cb7d3
... ... @@ -545,7 +545,7 @@
545 545 return -ENOMEM;
546 546  
547 547 memset(mmc, 0, sizeof(struct mmc));
548   - sprintf(mmc->name, "FSL_SDHC");
  548 + mmc->name = "FSL_SDHC";
549 549 regs = (struct fsl_esdhc *)cfg->esdhc_base;
550 550  
551 551 /* First reset the eSDHC controller */
drivers/mmc/ftsdc010_mci.c
Diff comments   View file @ 22cb7d3
... ... @@ -352,7 +352,7 @@
352 352 chip->regs = regs;
353 353 mmc->priv = chip;
354 354  
355   - sprintf(mmc->name, "ftsdc010");
  355 + mmc->name = "ftsdc010";
356 356 mmc->ops = &ftsdc010_ops;
357 357 mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz;
358 358 switch (readl(&regs->bwr) & FTSDC010_BWR_CAPS_MASK) {
drivers/mmc/gen_atmel_mci.c
Diff comments   View file @ 22cb7d3
... ... @@ -364,7 +364,7 @@
364 364 if (!mmc)
365 365 return -1;
366 366  
367   - strcpy(mmc->name, "mci");
  367 + mmc->name = "mci";
368 368 mmc->priv = regs;
369 369 mmc->ops = &atmel_mci_ops;
370 370  
drivers/mmc/mmc_spi.c
Diff comments   View file @ 22cb7d3
... ... @@ -274,7 +274,7 @@
274 274 free(mmc);
275 275 return NULL;
276 276 }
277   - sprintf(mmc->name, "MMC_SPI");
  277 + mmc->name = "MMC_SPI";
278 278 mmc->ops = &mmc_spi_ops;
279 279 mmc->host_caps = MMC_MODE_SPI;
280 280  
drivers/mmc/mxcmmc.c
Diff comments   View file @ 22cb7d3
... ... @@ -500,7 +500,7 @@
500 500 if (!mmc)
501 501 return -ENOMEM;
502 502  
503   - sprintf(mmc->name, "MXC MCI");
  503 + mmc->name = "MXC MCI";
504 504 mmc->ops = &mxcmci_ops;
505 505 mmc->host_caps = MMC_MODE_4BIT;
506 506  
drivers/mmc/mxsmmc.c
Diff comments   View file @ 22cb7d3
... ... @@ -405,7 +405,7 @@
405 405 priv->id = id;
406 406 priv->regs = mxs_ssp_regs_by_bus(id);
407 407  
408   - sprintf(mmc->name, "MXS MMC");
  408 + mmc->name = "MXS MMC";
409 409 mmc->ops = &mxsmmc_ops;
410 410 mmc->priv = priv;
411 411  
drivers/mmc/omap_hsmmc.c
Diff comments   View file @ 22cb7d3
... ... @@ -641,7 +641,7 @@
641 641 uint host_caps_val = MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS |
642 642 MMC_MODE_HC;
643 643  
644   - sprintf(mmc->name, "OMAP SD/MMC");
  644 + mmc->name = "OMAP SD/MMC";
645 645 mmc->ops = &omap_hsmmc_ops;
646 646 mmc->priv = priv_data;
647 647  
drivers/mmc/pxa_mmc_gen.c
Diff comments   View file @ 22cb7d3
... ... @@ -402,7 +402,7 @@
402 402  
403 403 mmc->priv = priv;
404 404  
405   - sprintf(mmc->name, "PXA MMC");
  405 + mmc->name = "PXA MMC";
406 406 mmc->ops = &pxa_mmc_ops;
407 407  
408 408 mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
... ... @@ -451,7 +451,7 @@
451 451 mmc->priv = host;
452 452 host->mmc = mmc;
453 453  
454   - sprintf(mmc->name, "%s", host->name);
  454 + mmc->name = host->name;
455 455 mmc->ops = &sdhci_ops;
456 456  
457 457 caps = sdhci_readl(host, SDHCI_CAPABILITIES);
drivers/mmc/sh_mmcif.c
Diff comments   View file @ 22cb7d3
... ... @@ -600,7 +600,7 @@
600 600 mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
601 601 mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT |
602 602 MMC_MODE_8BIT | MMC_MODE_HC;
603   - memcpy(mmc->name, DRIVER_NAME, sizeof(DRIVER_NAME));
  603 + mmc->name = DRIVER_NAME;
604 604 mmc->ops = &sh_mmcif_ops;
605 605 host->regs = (struct sh_mmcif_regs *)CONFIG_SH_MMCIF_ADDR;
606 606 host->clk = CONFIG_SH_MMCIF_CLK;
drivers/mmc/tegra_mmc.c
Diff comments   View file @ 22cb7d3
... ... @@ -563,7 +563,7 @@
563 563  
564 564 mmc = &mmc_dev[dev_index];
565 565  
566   - sprintf(mmc->name, "Tegra SD/MMC");
  566 + mmc->name = "Tegra SD/MMC";
567 567 mmc->priv = host;
568 568 mmc->ops = &tegra_mmc_ops;
569 569  
... ... @@ -264,7 +264,7 @@
264 264  
265 265 struct mmc {
266 266 struct list_head link;
267   - char name[32];
  267 + const char *name; /* no need for this to be an array */
268 268 void *priv;
269 269 uint voltages;
270 270 uint version;