diff options
| author |   Jérôme Pouiller <jerome.pouiller@silabs.com> | 2022-01-13 09:55:09 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-25 16:19:41 +0100 |
| commit | 5ea9415b27c46a8d3bd12c073b482c72d9ca11e4 (patch) | |
| tree | ec56c41c12fbed253c761798fad5a61491451269 | |
| parent | staging: wfx: prefix functions from hwio.h with wfx_ (diff) | |
staging: wfx: prefix functions from debug.h with wfx_
All the functions related to a driver should use the same prefix.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220113085524.1110708-17-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wfx/debug.c | 6 | ||||
| -rw-r--r-- | drivers/staging/wfx/debug.h | 6 | ||||
| -rw-r--r-- | drivers/staging/wfx/hif_tx.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index e5f940f19bbe..9324248b1d20 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -44,17 +44,17 @@ static const char *get_symbol(unsigned long val, return "unknown"; } -const char *get_hif_name(unsigned long id) +const char *wfx_get_hif_name(unsigned long id) { return get_symbol(id, hif_msg_print_map); } -const char *get_mib_name(unsigned long id) +const char *wfx_get_mib_name(unsigned long id) { return get_symbol(id, hif_mib_print_map); } -const char *get_reg_name(unsigned long id) +const char *wfx_get_reg_name(unsigned long id) { return get_symbol(id, wfx_reg_print_map); } diff --git a/drivers/staging/wfx/debug.h b/drivers/staging/wfx/debug.h index 4b9c49a9fffb..3840575e5e28 100644 --- a/drivers/staging/wfx/debug.h +++ b/drivers/staging/wfx/debug.h @@ -12,8 +12,8 @@ struct wfx_dev; int wfx_debug_init(struct wfx_dev *wdev); -const char *get_hif_name(unsigned long id); -const char *get_mib_name(unsigned long id); -const char *get_reg_name(unsigned long id); +const char *wfx_get_hif_name(unsigned long id); +const char *wfx_get_mib_name(unsigned long id); +const char *wfx_get_reg_name(unsigned long id); #endif diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 9899e7b62203..67f1847c1fc1 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -106,15 +106,15 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, if (ret && (cmd == HIF_REQ_ID_READ_MIB || cmd == HIF_REQ_ID_WRITE_MIB)) { - mib_name = get_mib_name(((u16 *)request)[2]); + mib_name = wfx_get_mib_name(((u16 *)request)[2]); mib_sep = "/"; } if (ret < 0) dev_err(wdev->dev, "hardware request %s%s%s (%#.2x) on vif %d returned error %d\n", - get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); + wfx_get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); if (ret > 0) dev_warn(wdev->dev, "hardware request %s%s%s (%#.2x) on vif %d returned status %d\n", - get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); + wfx_get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); return ret; } @@ -196,7 +196,7 @@ int wfx_hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, } if (ret == -ENOMEM) dev_err(wdev->dev, "buffer is too small to receive %s (%zu < %d)\n", - get_mib_name(mib_id), val_len, + wfx_get_mib_name(mib_id), val_len, le16_to_cpu(reply->length)); if (!ret) memcpy(val, &reply->mib_data, le16_to_cpu(reply->length)); |