Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / tcm_usb_gadget.c

diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 819875c7e3941719e2d3c6573a60e60e4a0be6d7..6cdb7a534f2384d7782f0ba751e6a037dbf44b28 100644 (file)
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -1383,10 +1383,8 @@ static struct se_node_acl *usbg_alloc_fabric_acl(struct se_portal_group *se_tpg)
        struct usbg_nacl *nacl;
 
        nacl = kzalloc(sizeof(struct usbg_nacl), GFP_KERNEL);
-       if (!nacl) {
-               printk(KERN_ERR "Unable to allocate struct usbg_nacl\n");
+       if (!nacl)
                return NULL;
-       }
 
        return &nacl->se_node_acl;
 }
@@ -1561,10 +1559,8 @@ static struct se_portal_group *usbg_make_tpg(
        }
 
        tpg = kzalloc(sizeof(struct usbg_tpg), GFP_KERNEL);
-       if (!tpg) {
-               printk(KERN_ERR "Unable to allocate struct usbg_tpg");
+       if (!tpg)
                return ERR_PTR(-ENOMEM);
-       }
        mutex_init(&tpg->tpg_mutex);
        atomic_set(&tpg->tpg_port_count, 0);
        tpg->workqueue = alloc_workqueue("tcm_usb_gadget", 0, 1);
@@ -1613,10 +1609,8 @@ static struct se_wwn *usbg_make_tport(
                return ERR_PTR(-EINVAL);
 
        tport = kzalloc(sizeof(struct usbg_tport), GFP_KERNEL);
-       if (!(tport)) {
-               printk(KERN_ERR "Unable to allocate struct usbg_tport");
+       if (!(tport))
                return ERR_PTR(-ENOMEM);
-       }
        tport->tport_wwpn = wwpn;
        snprintf(tport->tport_name, sizeof(tport->tport_name), "%s", wnn_name);
        return &tport->tport_wwn;
@@ -1727,10 +1721,8 @@ static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
 
        ret = -ENOMEM;
        tv_nexus = kzalloc(sizeof(*tv_nexus), GFP_KERNEL);
-       if (!tv_nexus) {
-               pr_err("Unable to allocate struct tcm_vhost_nexus\n");
+       if (!tv_nexus)
                goto err_unlock;
-       }
        tv_nexus->tvn_se_sess = transport_init_session(TARGET_PROT_NORMAL);
        if (IS_ERR(tv_nexus->tvn_se_sess))
                goto err_free;