Changed logging statements to use %s and __func__ instead of hard coding
the function name in a string.
Signed-off-by: Felix Siegel <felix.siegel@xxxxxxxxx>
---
drivers/staging/gasket/apex_driver.c | 15 ++++++++-------
drivers/staging/gasket/gasket_core.c | 11 ++++++-----
drivers/staging/gasket/gasket_ioctl.c | 4 ++--
drivers/staging/gasket/gasket_page_table.c | 13 ++++++++-----
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c
index ffcc59d..735d43d 100644
--- a/drivers/staging/gasket/apex_driver.c
+++ b/drivers/staging/gasket/apex_driver.c
@@ -341,7 +341,7 @@ static int apex_add_dev_cb(struct gasket_dev *gasket_dev)
ulong page_table_ready, msix_table_ready;
int retries = 0;
- gasket_log_error(gasket_dev, "apex_add_dev_cb.");
+ gasket_log_error(gasket_dev, "%s.", __func__);
apex_reset(gasket_dev, 0);
@@ -422,8 +422,9 @@ static int apex_device_cleanup(struct gasket_dev *gasket_dev)
gasket_log_info(
gasket_dev,
- "apex_device_cleanup 0x%p hib_error 0x%llx scalar_error "
+ "%s 0x%p hib_error 0x%llx scalar_error "
"0x%llx.",
+ __func__,
gasket_dev, hib_error, scalar_error);
if (allow_power_save)
@@ -447,13 +448,13 @@ static int apex_reset(struct gasket_dev *gasket_dev, uint type)
if (bypass_top_level)
return 0;
- gasket_log_debug(gasket_dev, "apex_reset.");
+ gasket_log_debug(gasket_dev, "%s.", __func__);
if (!is_gcb_in_reset(gasket_dev)) {
/* We are not in reset - toggle the reset bit so as to force
* re-init of custom block
*/
- gasket_log_debug(gasket_dev, "apex_reset: toggle reset.");
+ gasket_log_debug(gasket_dev, "%s: toggle reset.", __func__);
ret = apex_enter_reset(gasket_dev, type);
if (ret)
@@ -472,7 +473,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev, uint type)
if (bypass_top_level)
return 0;
- gasket_log_debug(gasket_dev, "apex_enter_reset.");
+ gasket_log_debug(gasket_dev, "%s.", __func__);
/*
* Software reset:
@@ -534,7 +535,7 @@ static int apex_quit_reset(struct gasket_dev *gasket_dev, uint type)
if (bypass_top_level)
return 0;
- gasket_log_debug(gasket_dev, "apex_quit_reset.");
+ gasket_log_debug(gasket_dev, "%s.", __func__);
/*
* Disable sleep mode:
@@ -681,7 +682,7 @@ static long apex_clock_gating(struct gasket_dev *gasket_dev, ulong arg)
return -EFAULT;
gasket_log_error(
- gasket_dev, "apex_clock_gating %llu", ibuf.enable);
+ gasket_dev, "%s %llu", __func__, ibuf.enable);
if (ibuf.enable) {
/* Quiesce AXI, gate GCB clock. */
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 5eeaae7..b14a956 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -932,7 +932,8 @@ static int gasket_enable_dev(
} else {
gasket_log_error(
gasket_dev,
- "gasket_enable_dev with no physical device!!");
+ "%s with no physical device!!",
+ __func__);
WARN_ON(1);
ddev = NULL;
}
@@ -2100,9 +2101,9 @@ int gasket_wait_sync(
if (diff_nanosec > timeout_ns) {
gasket_log_error(
gasket_dev,
- "gasket_wait_sync timeout: reg %llx count %x "
+ "%s timeout: reg %llx count %x "
"dma %lld ns\n",
- offset, count, diff_nanosec);
+ __func__, offset, count, diff_nanosec);
return -1;
}
reg = gasket_dev_read_64(gasket_dev, bar, offset);
@@ -2141,8 +2142,8 @@ int gasket_wait_with_reschedule(
if (retries == max_retries) {
gasket_log_error(
gasket_dev,
- "gasket_wait_with_reschedule timeout: reg %llx timeout (%llu ms)",
- offset, max_retries * delay_ms);
+ "%s timeout: reg %llx timeout (%llu ms)",
+ __func__, offset, max_retries * delay_ms);
return -EINVAL;
}
return 0;
diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c
index 832beed..738c56f 100644
--- a/drivers/staging/gasket/gasket_ioctl.c
+++ b/drivers/staging/gasket/gasket_ioctl.c
@@ -180,8 +180,8 @@ static uint gasket_ioctl_check_permissions(struct file *filp, uint cmd)
alive = (gasket_dev->status == GASKET_STATUS_ALIVE);
if (!alive) {
gasket_nodev_error(
- "gasket_ioctl_check_permissions alive %d status %d.",
- alive, gasket_dev->status);
+ "%s alive %d status %d.",
+ __func__, alive, gasket_dev->status);
}
root = capable(CAP_SYS_ADMIN);
diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 04ea0d2..8021272 100644
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -445,8 +445,9 @@ int gasket_page_table_map(
mutex_unlock(&pg_tbl->mutex);
gasket_nodev_debug(
- "gasket_page_table_map done: ha %llx daddr %llx num %d, "
+ "%s done: ha %llx daddr %llx num %d, "
"ret %d\n",
+ __func__,
(unsigned long long)host_addr,
(unsigned long long)dev_addr, num_pages, ret);
return ret;
@@ -869,7 +870,7 @@ static int gasket_perform_mapping(
for (i = 0; i < num_pages; i++) {
page_addr = host_addr + i * PAGE_SIZE;
offset = page_addr & (PAGE_SIZE - 1);
- gasket_nodev_debug("gasket_perform_mapping i %d\n", i);
+ gasket_nodev_debug("%s i %d\n", __func__, i);
if (is_coherent(pg_tbl, host_addr)) {
u64 off =
(u64)host_addr -
@@ -907,17 +908,19 @@ static int gasket_perform_mapping(
}
gasket_nodev_debug(
- " gasket_perform_mapping dev %p "
+ " %s dev %p "
"i %d pte %p pfn %p -> mapped %llx\n",
+ __func__,
pg_tbl->device, i, &ptes[i],
(void *)page_to_pfn(page),
(unsigned long long)ptes[i].dma_addr);
if (ptes[i].dma_addr == -1) {
gasket_nodev_error(
- "gasket_perform_mapping i %d"
+ "%s i %d"
" -> fail to map page %llx "
"[pfn %p ohys %p]\n",
+ __func__,
i,
(unsigned long long)ptes[i].dma_addr,
(void *)page_to_pfn(page),
@@ -1623,7 +1626,7 @@ int gasket_set_user_virt(
pg_tbl = gasket_dev->page_table[0];
if (!pg_tbl) {
gasket_nodev_error(
- "gasket_set_user_virt: invalid page table index");
+ "%s: invalid page table index", __func__);
return 0;
}
for (j = 0; j < num_pages; j++) {
--
2.7.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
