Skip to content

Commit c738888

Browse files
linuswWim Van Sebroeck
authored andcommitted
watchdog: db8500_wdt: Rename symbols
For conistency and clarity, rename all symbols and strings from ux500 to db8500 in the driver. Cc: Lee Jones <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Acked-by: Lee Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
1 parent d0305aa commit c738888

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

drivers/mfd/db8500-prcmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2939,7 +2939,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
29392939
};
29402940

29412941
static const struct mfd_cell common_prcmu_devs[] = {
2942-
MFD_CELL_NAME("ux500_wdt"),
2942+
MFD_CELL_NAME("db8500_wdt"),
29432943
MFD_CELL_NAME("db8500-cpuidle"),
29442944
};
29452945

drivers/watchdog/db8500_wdt.c

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,68 +35,68 @@ MODULE_PARM_DESC(nowayout,
3535
"Watchdog cannot be stopped once started (default="
3636
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
3737

38-
static int ux500_wdt_start(struct watchdog_device *wdd)
38+
static int db8500_wdt_start(struct watchdog_device *wdd)
3939
{
4040
return prcmu_enable_a9wdog(PRCMU_WDOG_ALL);
4141
}
4242

43-
static int ux500_wdt_stop(struct watchdog_device *wdd)
43+
static int db8500_wdt_stop(struct watchdog_device *wdd)
4444
{
4545
return prcmu_disable_a9wdog(PRCMU_WDOG_ALL);
4646
}
4747

48-
static int ux500_wdt_keepalive(struct watchdog_device *wdd)
48+
static int db8500_wdt_keepalive(struct watchdog_device *wdd)
4949
{
5050
return prcmu_kick_a9wdog(PRCMU_WDOG_ALL);
5151
}
5252

53-
static int ux500_wdt_set_timeout(struct watchdog_device *wdd,
53+
static int db8500_wdt_set_timeout(struct watchdog_device *wdd,
5454
unsigned int timeout)
5555
{
56-
ux500_wdt_stop(wdd);
56+
db8500_wdt_stop(wdd);
5757
prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
58-
ux500_wdt_start(wdd);
58+
db8500_wdt_start(wdd);
5959

6060
return 0;
6161
}
6262

63-
static const struct watchdog_info ux500_wdt_info = {
63+
static const struct watchdog_info db8500_wdt_info = {
6464
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
65-
.identity = "Ux500 WDT",
65+
.identity = "DB8500 WDT",
6666
.firmware_version = 1,
6767
};
6868

69-
static const struct watchdog_ops ux500_wdt_ops = {
69+
static const struct watchdog_ops db8500_wdt_ops = {
7070
.owner = THIS_MODULE,
71-
.start = ux500_wdt_start,
72-
.stop = ux500_wdt_stop,
73-
.ping = ux500_wdt_keepalive,
74-
.set_timeout = ux500_wdt_set_timeout,
71+
.start = db8500_wdt_start,
72+
.stop = db8500_wdt_stop,
73+
.ping = db8500_wdt_keepalive,
74+
.set_timeout = db8500_wdt_set_timeout,
7575
};
7676

77-
static struct watchdog_device ux500_wdt = {
78-
.info = &ux500_wdt_info,
79-
.ops = &ux500_wdt_ops,
77+
static struct watchdog_device db8500_wdt = {
78+
.info = &db8500_wdt_info,
79+
.ops = &db8500_wdt_ops,
8080
.min_timeout = WATCHDOG_MIN,
8181
.max_timeout = WATCHDOG_MAX28,
8282
};
8383

84-
static int ux500_wdt_probe(struct platform_device *pdev)
84+
static int db8500_wdt_probe(struct platform_device *pdev)
8585
{
8686
struct device *dev = &pdev->dev;
8787
int ret;
8888

8989
timeout = 600; /* Default to 10 minutes */
90-
ux500_wdt.parent = dev;
91-
watchdog_set_nowayout(&ux500_wdt, nowayout);
90+
db8500_wdt.parent = dev;
91+
watchdog_set_nowayout(&db8500_wdt, nowayout);
9292

9393
/* disable auto off on sleep */
9494
prcmu_config_a9wdog(PRCMU_WDOG_CPU1, false);
9595

9696
/* set HW initial value */
9797
prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
9898

99-
ret = devm_watchdog_register_device(dev, &ux500_wdt);
99+
ret = devm_watchdog_register_device(dev, &db8500_wdt);
100100
if (ret)
101101
return ret;
102102

@@ -106,47 +106,47 @@ static int ux500_wdt_probe(struct platform_device *pdev)
106106
}
107107

108108
#ifdef CONFIG_PM
109-
static int ux500_wdt_suspend(struct platform_device *pdev,
109+
static int db8500_wdt_suspend(struct platform_device *pdev,
110110
pm_message_t state)
111111
{
112-
if (watchdog_active(&ux500_wdt)) {
113-
ux500_wdt_stop(&ux500_wdt);
112+
if (watchdog_active(&db8500_wdt)) {
113+
db8500_wdt_stop(&db8500_wdt);
114114
prcmu_config_a9wdog(PRCMU_WDOG_CPU1, true);
115115

116116
prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
117-
ux500_wdt_start(&ux500_wdt);
117+
db8500_wdt_start(&db8500_wdt);
118118
}
119119
return 0;
120120
}
121121

122-
static int ux500_wdt_resume(struct platform_device *pdev)
122+
static int db8500_wdt_resume(struct platform_device *pdev)
123123
{
124-
if (watchdog_active(&ux500_wdt)) {
125-
ux500_wdt_stop(&ux500_wdt);
124+
if (watchdog_active(&db8500_wdt)) {
125+
db8500_wdt_stop(&db8500_wdt);
126126
prcmu_config_a9wdog(PRCMU_WDOG_CPU1, false);
127127

128128
prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
129-
ux500_wdt_start(&ux500_wdt);
129+
db8500_wdt_start(&db8500_wdt);
130130
}
131131
return 0;
132132
}
133133
#else
134-
#define ux500_wdt_suspend NULL
135-
#define ux500_wdt_resume NULL
134+
#define db8500_wdt_suspend NULL
135+
#define db8500_wdt_resume NULL
136136
#endif
137137

138-
static struct platform_driver ux500_wdt_driver = {
139-
.probe = ux500_wdt_probe,
140-
.suspend = ux500_wdt_suspend,
141-
.resume = ux500_wdt_resume,
138+
static struct platform_driver db8500_wdt_driver = {
139+
.probe = db8500_wdt_probe,
140+
.suspend = db8500_wdt_suspend,
141+
.resume = db8500_wdt_resume,
142142
.driver = {
143-
.name = "ux500_wdt",
143+
.name = "db8500_wdt",
144144
},
145145
};
146146

147-
module_platform_driver(ux500_wdt_driver);
147+
module_platform_driver(db8500_wdt_driver);
148148

149149
MODULE_AUTHOR("Jonas Aaberg <[email protected]>");
150-
MODULE_DESCRIPTION("Ux500 Watchdog Driver");
150+
MODULE_DESCRIPTION("DB8500 Watchdog Driver");
151151
MODULE_LICENSE("GPL");
152-
MODULE_ALIAS("platform:ux500_wdt");
152+
MODULE_ALIAS("platform:db8500_wdt");

0 commit comments

Comments
 (0)