These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / brocade / bna / bnad_debugfs.c

diff --git a/kernel/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/kernel/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
index 72c8955..8fc246e 100644 (file)
--- a/kernel/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
+++ b/kernel/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
@@ -76,8 +76,7 @@ bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file)
                fw_debug->debug_buffer = NULL;
                kfree(fw_debug);
                fw_debug = NULL;
-               pr_warn("bnad %s: Failed to collect fwtrc\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed to collect fwtrc\n");
                return -ENOMEM;
        }
 
@@ -117,8 +116,7 @@ bnad_debugfs_open_fwsave(struct inode *inode, struct file *file)
                fw_debug->debug_buffer = NULL;
                kfree(fw_debug);
                fw_debug = NULL;
-               pr_warn("bna %s: Failed to collect fwsave\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed to collect fwsave\n");
                return -ENOMEM;
        }
 
@@ -217,8 +215,7 @@ bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file)
                drv_info->debug_buffer = NULL;
                kfree(drv_info);
                drv_info = NULL;
-               pr_warn("bna %s: Failed to collect drvinfo\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed to collect drvinfo\n");
                return -ENOMEM;
        }
 
@@ -271,15 +268,15 @@ bna_reg_offset_check(struct bfa_ioc *ioc, u32 offset, u32 len)
        area = (offset >> 15) & 0x7;
        if (area == 0) {
                /* PCIe core register */
-               if ((offset + (len<<2)) > 0x8000)       /* 8k dwords or 32KB */
+               if (offset + (len << 2) > 0x8000)       /* 8k dwords or 32KB */
                        return BFA_STATUS_EINVAL;
        } else if (area == 0x1) {
                /* CB 32 KB memory page */
-               if ((offset + (len<<2)) > 0x10000)      /* 8k dwords or 32KB */
+               if (offset + (len << 2) > 0x10000)      /* 8k dwords or 32KB */
                        return BFA_STATUS_EINVAL;
        } else {
                /* CB register space 64KB */
-               if ((offset + (len<<2)) > BFA_REG_ADDRMSK(ioc))
+               if (offset + (len << 2) > BFA_REG_ADDRMSK(ioc))
                        return BFA_STATUS_EINVAL;
        }
        return BFA_STATUS_OK;
@@ -321,27 +318,20 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
        unsigned long flags;
        void *kern_buf;
 
-       /* Allocate memory to store the user space buf */
-       kern_buf = kzalloc(nbytes, GFP_KERNEL);
-       if (!kern_buf)
-               return -ENOMEM;
-
-       if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
-               kfree(kern_buf);
-               return -ENOMEM;
-       }
+       /* Copy the user space buf */
+       kern_buf = memdup_user(buf, nbytes);
+       if (IS_ERR(kern_buf))
+               return PTR_ERR(kern_buf);
 
        rc = sscanf(kern_buf, "%x:%x", &addr, &len);
        if (rc < 2) {
-               pr_warn("bna %s: Failed to read user buffer\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed to read user buffer\n");
                kfree(kern_buf);
                return -EINVAL;
        }
 
        kfree(kern_buf);
        kfree(bnad->regdata);
-       bnad->regdata = NULL;
        bnad->reglen = 0;
 
        bnad->regdata = kzalloc(len << 2, GFP_KERNEL);
@@ -355,8 +345,7 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
        /* offset and len sanity check */
        rc = bna_reg_offset_check(ioc, addr, len);
        if (rc) {
-               pr_warn("bna %s: Failed reg offset check\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed reg offset check\n");
                kfree(bnad->regdata);
                bnad->regdata = NULL;
                bnad->reglen = 0;
@@ -388,20 +377,14 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,
        unsigned long flags;
        void *kern_buf;
 
-       /* Allocate memory to store the user space buf */
-       kern_buf = kzalloc(nbytes, GFP_KERNEL);
-       if (!kern_buf)
-               return -ENOMEM;
-
-       if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
-               kfree(kern_buf);
-               return -ENOMEM;
-       }
+       /* Copy the user space buf */
+       kern_buf = memdup_user(buf, nbytes);
+       if (IS_ERR(kern_buf))
+               return PTR_ERR(kern_buf);
 
        rc = sscanf(kern_buf, "%x:%x", &addr, &val);
        if (rc < 2) {
-               pr_warn("bna %s: Failed to read user buffer\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed to read user buffer\n");
                kfree(kern_buf);
                return -EINVAL;
        }
@@ -412,8 +395,7 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,
        /* offset and len sanity check */
        rc = bna_reg_offset_check(ioc, addr, 1);
        if (rc) {
-               pr_warn("bna %s: Failed reg offset check\n",
-                       pci_name(bnad->pcidev));
+               netdev_warn(bnad->netdev, "failed reg offset check\n");
                return -EINVAL;
        }
 
@@ -525,7 +507,8 @@ bnad_debugfs_init(struct bnad *bnad)
                bna_debugfs_root = debugfs_create_dir("bna", NULL);
                atomic_set(&bna_debugfs_port_count, 0);
                if (!bna_debugfs_root) {
-                       pr_warn("BNA: debugfs root dir creation failed\n");
+                       netdev_warn(bnad->netdev,
+                                   "debugfs root dir creation failed\n");
                        return;
                }
        }
@@ -536,8 +519,8 @@ bnad_debugfs_init(struct bnad *bnad)
                bnad->port_debugfs_root =
                        debugfs_create_dir(name, bna_debugfs_root);
                if (!bnad->port_debugfs_root) {
-                       pr_warn("bna pci_dev %s: root dir creation failed\n",
-                               pci_name(bnad->pcidev));
+                       netdev_warn(bnad->netdev,
+                                   "debugfs root dir creation failed\n");
                        return;
                }
 
@@ -552,9 +535,9 @@ bnad_debugfs_init(struct bnad *bnad)
                                                        bnad,
                                                        file->fops);
                        if (!bnad->bnad_dentry_files[i]) {
-                               pr_warn(
-                                    "BNA pci_dev:%s: create %s entry failed\n",
-                                    pci_name(bnad->pcidev), file->name);
+                               netdev_warn(bnad->netdev,
+                                           "create %s entry failed\n",
+                                           file->name);
                                return;
                        }
                }