[PATCH v2 07/12] w1: use __func__ for logging the function name
From: Steffen Vogel
Date: Sun Oct 28 2018 - 23:04:44 EST
This fixes a warning raised by the checkpatch tool.
Signed-off-by: Steffen Vogel <post@xxxxxxxxxxxxxxx>
---
drivers/w1/w1.c | 5 +++--
drivers/w1/w1_int.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index cbfc3f7012de..4cbe1849fbfc 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -1066,7 +1066,8 @@ void w1_search(struct w1_master *dev, u8 search_type,
if (test_bit(W1_ABORT_SEARCH, &dev->flags)) {
mutex_unlock(&dev->bus_mutex);
- dev_dbg(&dev->dev, "Abort w1_search\n");
+ dev_dbg(&dev->dev, "Abort %s\n", __func__);
+
return;
}
}
@@ -1094,7 +1095,7 @@ void w1_search(struct w1_master *dev, u8 search_type,
* bus).
*/
dev_info(&dev->dev, "%s: max_slave_count %d reached, will continue next search.\n",
- __func__, dev->max_slave_count);
+ __func__, dev->max_slave_count);
set_bit(W1_WARN_MAX_COUNT, &dev->flags);
}
}
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index a6c011e57c90..a5230c0d49e3 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -98,7 +98,7 @@ int w1_add_master_device(struct w1_bus_master *master)
if (!(master->touch_bit && master->reset_bus) &&
!(master->write_bit && master->read_bit) &&
!(master->write_byte && master->read_byte && master->reset_bus)) {
- pr_err("w1_add_master_device: invalid function set\n");
+ pr_err("%s: invalid function set\n", __func__);
return(-EINVAL);
}
--
2.11.0