Merge tag 'wireless-drivers-2021-09-07' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / net / ethernet / hisilicon / hns3 / hns3_debugfs.c

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
index 80461ab..2b66c59 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
@@ -38,9 +38,8 @@ static struct hns3_dbg_dentry_info hns3_dbg_dentry[] = {
        },
 };
 
-static int hns3_dbg_bd_file_init(struct hnae3_handle *handle, unsigned int cmd);
-static int hns3_dbg_common_file_init(struct hnae3_handle *handle,
-                                    unsigned int cmd);
+static int hns3_dbg_bd_file_init(struct hnae3_handle *handle, u32 cmd);
+static int hns3_dbg_common_file_init(struct hnae3_handle *handle, u32 cmd);
 
 static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {
        {
@@ -696,7 +695,7 @@ static int hns3_dbg_queue_map(struct hnae3_handle *h, char *buf, int len)
                sprintf(result[j++], "%u", i);
                sprintf(result[j++], "%u",
                        h->ae_algo->ops->get_global_queue_id(h, i));
-               sprintf(result[j++], "%u",
+               sprintf(result[j++], "%d",
                        priv->ring[i].tqp_vector->vector_irq);
                hns3_dbg_fill_content(content, sizeof(content), queue_map_items,
                                      (const char **)result,
@@ -798,10 +797,10 @@ static const struct hns3_dbg_item tx_bd_info_items[] = {
        { "T_CS_VLAN_TSO", 2 },
        { "OT_VLAN_TAG", 3 },
        { "TV", 2 },
-       { "OLT_VLAN_LEN", 2},
-       { "PAYLEN_OL4CS", 2},
-       { "BD_FE_SC_VLD", 2},
-       { "MSS_HW_CSUM", 0},
+       { "OLT_VLAN_LEN", 2 },
+       { "PAYLEN_OL4CS", 2 },
+       { "BD_FE_SC_VLD", 2 },
+       { "MSS_HW_CSUM", 0 },
 };
 
 static void hns3_dump_tx_bd_info(struct hns3_nic_priv *priv,
@@ -868,7 +867,7 @@ static void
 hns3_dbg_dev_caps(struct hnae3_handle *h, char *buf, int len, int *pos)
 {
        struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev);
-       static const char * const str[] = {"no", "yes"};
+       const char * const str[] = {"no", "yes"};
        unsigned long *caps = ae_dev->caps;
        u32 i, state;