Throughout i2c_driver.c, there are instances where the log strings
contain the function's name hardcoded into the string. Instead, use the
printk conversion specifier '%s' with the __func__ preprocessor
identifier to more maintainably print the function's name.
Signed-off-by: Geordan Neukum <gneuk...@gmail.com>
---
drivers/staging/kpc2000/kpc_i2c/i2c_driver.c | 27 +++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c
b/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c
index 9b9de81c8548..03e401322a18 100644
--- a/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c
+++ b/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c
@@ -142,7 +142,7 @@ static int i801_check_pre(struct i2c_device *priv)
{
int status;
- dev_dbg(&priv->adapter.dev, "i801_check_pre\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
status = inb_p(SMBHSTSTS(priv));
if (status & SMBHSTSTS_HOST_BUSY) {
@@ -168,7 +168,7 @@ static int i801_check_post(struct i2c_device *priv, int
status, int timeout)
{
int result = 0;
- dev_dbg(&priv->adapter.dev, "i801_check_post\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
/* If the SMBus is still busy, we give up */
if (timeout) {
@@ -219,7 +219,7 @@ static int i801_transaction(struct i2c_device *priv, int
xact)
int result;
int timeout = 0;
- dev_dbg(&priv->adapter.dev, "i801_transaction\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
result = i801_check_pre(priv);
if (result < 0) {
@@ -250,7 +250,7 @@ static void i801_wait_hwpec(struct i2c_device *priv)
int timeout = 0;
int status;
- dev_dbg(&priv->adapter.dev, "i801_wait_hwpec\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
do {
usleep_range(250, 500);
@@ -269,7 +269,7 @@ static int i801_block_transaction_by_block(struct
i2c_device *priv, union i2c_sm
int i, len;
int status;
- dev_dbg(&priv->adapter.dev, "i801_block_transaction_by_block\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */
@@ -309,7 +309,7 @@ static int i801_block_transaction_byte_by_byte(struct
i2c_device *priv, union i2
int result;
int timeout;
- dev_dbg(&priv->adapter.dev, "i801_block_transaction_byte_by_byte\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
result = i801_check_pre(priv);
if (result < 0) {
@@ -383,7 +383,7 @@ static int i801_block_transaction_byte_by_byte(struct
i2c_device *priv, union i2
static int i801_set_block_buffer_mode(struct i2c_device *priv)
{
- dev_dbg(&priv->adapter.dev, "i801_set_block_buffer_mode\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_E32B, SMBAUXCTL(priv));
if ((inb_p(SMBAUXCTL(priv)) & SMBAUXCTL_E32B) == 0) {
@@ -398,7 +398,7 @@ static int i801_block_transaction(struct i2c_device *priv,
union i2c_smbus_data
int result = 0;
//unsigned char hostc;
- dev_dbg(&priv->adapter.dev, "i801_block_transaction\n");
+ dev_dbg(&priv->adapter.dev, "%s\n", __func__);
if (command == I2C_SMBUS_I2C_BLOCK_DATA) {
if (read_write == I2C_SMBUS_WRITE) {
@@ -450,8 +450,9 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
unsigned short flags,
int ret, xact = 0;
struct i2c_device *priv = i2c_get_adapdata(adap);
- dev_dbg(&priv->adapter.dev, "i801_access (addr=%0d) flags=%x
read_write=%x command=%x size=%x",
- addr, flags, read_write, command, size );
+ dev_dbg(&priv->adapter.dev,
+ "%s (addr=%0d) flags=%x read_write=%x command=%x size=%x",
+ __func__, addr, flags, read_write, command, size);
hwpec = (priv->features & FEATURE_SMBUS_PEC) && (flags &
I2C_CLIENT_PEC) && size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA;
@@ -626,7 +627,8 @@ int pi2c_probe(struct platform_device *pldev)
struct i2c_device *priv;
struct resource *res;
- dev_dbg(&pldev->dev, "pi2c_probe(pldev = %p '%s')\n", pldev,
pldev->name);
+ dev_dbg(&pldev->dev, "%s(pldev = %p '%s')\n", __func__, pldev,
+ pldev->name);
priv = devm_kzalloc(&pldev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) {
@@ -673,7 +675,8 @@ int pi2c_probe(struct platform_device *pldev)
int pi2c_remove(struct platform_device *pldev)
{
struct i2c_device *lddev;
- dev_dbg(&pldev->dev, "pi2c_remove(pldev = %p '%s')\n", pldev,
pldev->name);
+ dev_dbg(&pldev->dev, "%s(pldev = %p '%s')\n", __func__, pldev,
+ pldev->name);
lddev = (struct i2c_device *)pldev->dev.platform_data;
--
2.21.0
