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

memory: tegra30-emc: Add the SoC model prefix to functions

Replace "tegra_emc" with "tegra30_emc" in all functions to:
1. Avoid name clashing with other Tegra EMC drivers which makes it
easier to jump to function definitions,
2. Decode the calltraces a bit easier,
3. Unify with other Tegra MC and EMC drivers, which use the SoC model
prefixes.

No functional impact.

Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

+45 -45
+45 -45
drivers/memory/tegra/tegra30-emc.c
··· 413 413 return 0; 414 414 } 415 415 416 - static irqreturn_t tegra_emc_isr(int irq, void *data) 416 + static irqreturn_t tegra30_emc_isr(int irq, void *data) 417 417 { 418 418 struct tegra_emc *emc = data; 419 419 u32 intmask = EMC_REFRESH_OVERFLOW_INT; ··· 1228 1228 return timing->rate; 1229 1229 } 1230 1230 1231 - static void tegra_emc_rate_requests_init(struct tegra_emc *emc) 1231 + static void tegra30_emc_rate_requests_init(struct tegra_emc *emc) 1232 1232 { 1233 1233 unsigned int i; 1234 1234 ··· 1330 1330 * valid range. 1331 1331 */ 1332 1332 1333 - static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate) 1333 + static bool tegra30_emc_validate_rate(struct tegra_emc *emc, unsigned long rate) 1334 1334 { 1335 1335 unsigned int i; 1336 1336 ··· 1341 1341 return false; 1342 1342 } 1343 1343 1344 - static int tegra_emc_debug_available_rates_show(struct seq_file *s, void *data) 1344 + static int tegra30_emc_debug_available_rates_show(struct seq_file *s, void *data) 1345 1345 { 1346 1346 struct tegra_emc *emc = s->private; 1347 1347 const char *prefix = ""; ··· 1356 1356 1357 1357 return 0; 1358 1358 } 1359 - DEFINE_SHOW_ATTRIBUTE(tegra_emc_debug_available_rates); 1359 + DEFINE_SHOW_ATTRIBUTE(tegra30_emc_debug_available_rates); 1360 1360 1361 - static int tegra_emc_debug_min_rate_get(void *data, u64 *rate) 1361 + static int tegra30_emc_debug_min_rate_get(void *data, u64 *rate) 1362 1362 { 1363 1363 struct tegra_emc *emc = data; 1364 1364 ··· 1367 1367 return 0; 1368 1368 } 1369 1369 1370 - static int tegra_emc_debug_min_rate_set(void *data, u64 rate) 1370 + static int tegra30_emc_debug_min_rate_set(void *data, u64 rate) 1371 1371 { 1372 1372 struct tegra_emc *emc = data; 1373 1373 int err; 1374 1374 1375 - if (!tegra_emc_validate_rate(emc, rate)) 1375 + if (!tegra30_emc_validate_rate(emc, rate)) 1376 1376 return -EINVAL; 1377 1377 1378 1378 err = emc_set_min_rate(emc, rate, EMC_RATE_DEBUG); ··· 1384 1384 return 0; 1385 1385 } 1386 1386 1387 - DEFINE_DEBUGFS_ATTRIBUTE(tegra_emc_debug_min_rate_fops, 1388 - tegra_emc_debug_min_rate_get, 1389 - tegra_emc_debug_min_rate_set, "%llu\n"); 1387 + DEFINE_DEBUGFS_ATTRIBUTE(tegra30_emc_debug_min_rate_fops, 1388 + tegra30_emc_debug_min_rate_get, 1389 + tegra30_emc_debug_min_rate_set, "%llu\n"); 1390 1390 1391 - static int tegra_emc_debug_max_rate_get(void *data, u64 *rate) 1391 + static int tegra30_emc_debug_max_rate_get(void *data, u64 *rate) 1392 1392 { 1393 1393 struct tegra_emc *emc = data; 1394 1394 ··· 1397 1397 return 0; 1398 1398 } 1399 1399 1400 - static int tegra_emc_debug_max_rate_set(void *data, u64 rate) 1400 + static int tegra30_emc_debug_max_rate_set(void *data, u64 rate) 1401 1401 { 1402 1402 struct tegra_emc *emc = data; 1403 1403 int err; 1404 1404 1405 - if (!tegra_emc_validate_rate(emc, rate)) 1405 + if (!tegra30_emc_validate_rate(emc, rate)) 1406 1406 return -EINVAL; 1407 1407 1408 1408 err = emc_set_max_rate(emc, rate, EMC_RATE_DEBUG); ··· 1414 1414 return 0; 1415 1415 } 1416 1416 1417 - DEFINE_DEBUGFS_ATTRIBUTE(tegra_emc_debug_max_rate_fops, 1418 - tegra_emc_debug_max_rate_get, 1419 - tegra_emc_debug_max_rate_set, "%llu\n"); 1417 + DEFINE_DEBUGFS_ATTRIBUTE(tegra30_emc_debug_max_rate_fops, 1418 + tegra30_emc_debug_max_rate_get, 1419 + tegra30_emc_debug_max_rate_set, "%llu\n"); 1420 1420 1421 - static void tegra_emc_debugfs_init(struct tegra_emc *emc) 1421 + static void tegra30_emc_debugfs_init(struct tegra_emc *emc) 1422 1422 { 1423 1423 struct device *dev = emc->dev; 1424 1424 unsigned int i; ··· 1451 1451 emc->debugfs.root = debugfs_create_dir("emc", NULL); 1452 1452 1453 1453 debugfs_create_file("available_rates", 0444, emc->debugfs.root, 1454 - emc, &tegra_emc_debug_available_rates_fops); 1454 + emc, &tegra30_emc_debug_available_rates_fops); 1455 1455 debugfs_create_file("min_rate", 0644, emc->debugfs.root, 1456 - emc, &tegra_emc_debug_min_rate_fops); 1456 + emc, &tegra30_emc_debug_min_rate_fops); 1457 1457 debugfs_create_file("max_rate", 0644, emc->debugfs.root, 1458 - emc, &tegra_emc_debug_max_rate_fops); 1458 + emc, &tegra30_emc_debug_max_rate_fops); 1459 1459 } 1460 1460 1461 1461 static inline struct tegra_emc * ··· 1518 1518 return 0; 1519 1519 } 1520 1520 1521 - static int tegra_emc_interconnect_init(struct tegra_emc *emc) 1521 + static int tegra30_emc_interconnect_init(struct tegra_emc *emc) 1522 1522 { 1523 1523 const struct tegra_mc_soc *soc = emc->mc->soc; 1524 1524 struct icc_node *node; ··· 1567 1567 return dev_err_probe(emc->dev, err, "failed to initialize ICC\n"); 1568 1568 } 1569 1569 1570 - static void devm_tegra_emc_unset_callback(void *data) 1570 + static void devm_tegra30_emc_unset_callback(void *data) 1571 1571 { 1572 1572 tegra20_clk_set_emc_round_callback(NULL, NULL); 1573 1573 } 1574 1574 1575 - static void devm_tegra_emc_unreg_clk_notifier(void *data) 1575 + static void devm_tegra30_emc_unreg_clk_notifier(void *data) 1576 1576 { 1577 1577 struct tegra_emc *emc = data; 1578 1578 1579 1579 clk_notifier_unregister(emc->clk, &emc->clk_nb); 1580 1580 } 1581 1581 1582 - static int tegra_emc_init_clk(struct tegra_emc *emc) 1582 + static int tegra30_emc_init_clk(struct tegra_emc *emc) 1583 1583 { 1584 1584 int err; 1585 1585 1586 1586 tegra20_clk_set_emc_round_callback(emc_round_rate, emc); 1587 1587 1588 - err = devm_add_action_or_reset(emc->dev, devm_tegra_emc_unset_callback, 1588 + err = devm_add_action_or_reset(emc->dev, devm_tegra30_emc_unset_callback, 1589 1589 NULL); 1590 1590 if (err) 1591 1591 return err; ··· 1600 1600 return dev_err_probe(emc->dev, err, "failed to register clk notifier\n"); 1601 1601 1602 1602 err = devm_add_action_or_reset(emc->dev, 1603 - devm_tegra_emc_unreg_clk_notifier, emc); 1603 + devm_tegra30_emc_unreg_clk_notifier, emc); 1604 1604 if (err) 1605 1605 return err; 1606 1606 1607 1607 return 0; 1608 1608 } 1609 1609 1610 - static int tegra_emc_probe(struct platform_device *pdev) 1610 + static int tegra30_emc_probe(struct platform_device *pdev) 1611 1611 { 1612 1612 struct tegra_core_opp_params opp_params = {}; 1613 1613 struct device_node *np; ··· 1648 1648 1649 1649 emc->irq = err; 1650 1650 1651 - err = devm_request_irq(&pdev->dev, emc->irq, tegra_emc_isr, 0, 1651 + err = devm_request_irq(&pdev->dev, emc->irq, tegra30_emc_isr, 0, 1652 1652 dev_name(&pdev->dev), emc); 1653 1653 if (err) 1654 1654 return dev_err_probe(&pdev->dev, err, "failed to request irq\n"); 1655 1655 1656 - err = tegra_emc_init_clk(emc); 1656 + err = tegra30_emc_init_clk(emc); 1657 1657 if (err) 1658 1658 return err; 1659 1659 ··· 1664 1664 return err; 1665 1665 1666 1666 platform_set_drvdata(pdev, emc); 1667 - tegra_emc_rate_requests_init(emc); 1668 - tegra_emc_debugfs_init(emc); 1669 - tegra_emc_interconnect_init(emc); 1667 + tegra30_emc_rate_requests_init(emc); 1668 + tegra30_emc_debugfs_init(emc); 1669 + tegra30_emc_interconnect_init(emc); 1670 1670 1671 1671 /* 1672 1672 * Don't allow the kernel module to be unloaded. Unloading adds some ··· 1678 1678 return 0; 1679 1679 } 1680 1680 1681 - static int tegra_emc_suspend(struct device *dev) 1681 + static int tegra30_emc_suspend(struct device *dev) 1682 1682 { 1683 1683 struct tegra_emc *emc = dev_get_drvdata(dev); 1684 1684 int err; ··· 1699 1699 return 0; 1700 1700 } 1701 1701 1702 - static int tegra_emc_resume(struct device *dev) 1702 + static int tegra30_emc_resume(struct device *dev) 1703 1703 { 1704 1704 struct tegra_emc *emc = dev_get_drvdata(dev); 1705 1705 ··· 1711 1711 return 0; 1712 1712 } 1713 1713 1714 - static const struct dev_pm_ops tegra_emc_pm_ops = { 1715 - .suspend = tegra_emc_suspend, 1716 - .resume = tegra_emc_resume, 1714 + static const struct dev_pm_ops tegra30_emc_pm_ops = { 1715 + .suspend = tegra30_emc_suspend, 1716 + .resume = tegra30_emc_resume, 1717 1717 }; 1718 1718 1719 - static const struct of_device_id tegra_emc_of_match[] = { 1719 + static const struct of_device_id tegra30_emc_of_match[] = { 1720 1720 { .compatible = "nvidia,tegra30-emc", }, 1721 1721 {}, 1722 1722 }; 1723 - MODULE_DEVICE_TABLE(of, tegra_emc_of_match); 1723 + MODULE_DEVICE_TABLE(of, tegra30_emc_of_match); 1724 1724 1725 - static struct platform_driver tegra_emc_driver = { 1726 - .probe = tegra_emc_probe, 1725 + static struct platform_driver tegra30_emc_driver = { 1726 + .probe = tegra30_emc_probe, 1727 1727 .driver = { 1728 1728 .name = "tegra30-emc", 1729 - .of_match_table = tegra_emc_of_match, 1730 - .pm = &tegra_emc_pm_ops, 1729 + .of_match_table = tegra30_emc_of_match, 1730 + .pm = &tegra30_emc_pm_ops, 1731 1731 .suppress_bind_attrs = true, 1732 1732 .sync_state = icc_sync_state, 1733 1733 }, 1734 1734 }; 1735 - module_platform_driver(tegra_emc_driver); 1735 + module_platform_driver(tegra30_emc_driver); 1736 1736 1737 1737 MODULE_AUTHOR("Dmitry Osipenko <digetx@gmail.com>"); 1738 1738 MODULE_DESCRIPTION("NVIDIA Tegra30 EMC driver");