]> git.baikalelectronics.ru Git - kernel.git/commitdiff
bnxt_en: Use a common function to print the same ethtool -f error message.
authorMichael Chan <michael.chan@broadcom.com>
Fri, 30 Aug 2019 03:54:44 +0000 (23:54 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Aug 2019 21:02:18 +0000 (14:02 -0700)
The same message is printed 3 times in the code, so use a common function
to do that.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

index b624174c85942b7e5220daacfad68d89038b2340..72bb730ec534f8f3623bbb8b3575af34f6c157d2 100644 (file)
@@ -1699,6 +1699,11 @@ static u32 bnxt_get_link(struct net_device *dev)
        return bp->link_info.link_up;
 }
 
+static void bnxt_print_admin_err(struct bnxt *bp)
+{
+       netdev_info(bp->dev, "PF does not have admin privileges to flash or reset the device\n");
+}
+
 static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
                                u16 ext, u16 *index, u32 *item_length,
                                u32 *data_length);
@@ -1739,8 +1744,7 @@ static int bnxt_flash_nvram(struct net_device *dev,
        dma_free_coherent(&bp->pdev->dev, data_len, kmem, dma_handle);
 
        if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
-               netdev_info(dev,
-                           "PF does not have admin privileges to flash the device\n");
+               bnxt_print_admin_err(bp);
                rc = -EACCES;
        } else if (rc) {
                rc = -EIO;
@@ -1795,8 +1799,7 @@ static int bnxt_firmware_reset(struct net_device *dev,
 
        rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
        if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
-               netdev_info(dev,
-                           "PF does not have admin privileges to reset the device\n");
+               bnxt_print_admin_err(bp);
                rc = -EACCES;
        } else if (rc) {
                rc = -EIO;
@@ -2096,8 +2099,7 @@ flash_pkg_exit:
        mutex_unlock(&bp->hwrm_cmd_lock);
 err_exit:
        if (hwrm_err == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
-               netdev_info(dev,
-                           "PF does not have admin privileges to flash the device\n");
+               bnxt_print_admin_err(bp);
                rc = -EACCES;
        } else if (hwrm_err) {
                rc = -EOPNOTSUPP;