1 files changed, 48 insertions, 62 deletions

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 38d949405618..83406696c7aa 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -81,6 +81,7 @@ u16 rio_local_get_device_id(struct rio_mport *port)
 
         return (RIO_GET_DID(port->sys_size, result));
 }
+EXPORT_SYMBOL_GPL(rio_local_get_device_id);
 
 /**
  * rio_query_mport - Query mport device attributes
@@ -110,9 +111,8 @@ EXPORT_SYMBOL(rio_query_mport);
  */
 struct rio_net *rio_alloc_net(struct rio_mport *mport)
 {
-        struct rio_net *net;
+        struct rio_net *net = kzalloc(sizeof(*net), GFP_KERNEL);
 
-        net = kzalloc(sizeof(struct rio_net), GFP_KERNEL);
         if (net) {
                 INIT_LIST_HEAD(&net->node);
                 INIT_LIST_HEAD(&net->devices);
@@ -243,18 +243,17 @@ int rio_request_inb_mbox(struct rio_mport *mport,
         int rc = -ENOSYS;
         struct resource *res;
 
-        if (mport->ops->open_inb_mbox == NULL)
+        if (!mport->ops->open_inb_mbox)
                 goto out;
 
-        res = kzalloc(sizeof(struct resource), GFP_KERNEL);
-
+        res = kzalloc(sizeof(*res), GFP_KERNEL);
         if (res) {
                 rio_init_mbox_res(res, mbox, mbox);
 
                 /* Make sure this mailbox isn't in use */
-                if ((rc =
-                     request_resource(&mport->riores[RIO_INB_MBOX_RESOURCE],
-                                      res)) < 0) {
+                rc = request_resource(&mport->riores[RIO_INB_MBOX_RESOURCE],
+                                      res);
+                if (rc < 0) {
                         kfree(res);
                         goto out;
                 }
@@ -277,6 +276,7 @@ int rio_request_inb_mbox(struct rio_mport *mport,
       out:
         return rc;
 }
+EXPORT_SYMBOL_GPL(rio_request_inb_mbox);
 
 /**
  * rio_release_inb_mbox - release inbound mailbox message service
@@ -305,6 +305,7 @@ int rio_release_inb_mbox(struct rio_mport *mport, int mbox)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(rio_release_inb_mbox);
 
 /**
  * rio_request_outb_mbox - request outbound mailbox service
@@ -326,18 +327,17 @@ int rio_request_outb_mbox(struct rio_mport *mport,
         int rc = -ENOSYS;
         struct resource *res;
 
-        if (mport->ops->open_outb_mbox == NULL)
+        if (!mport->ops->open_outb_mbox)
                 goto out;
 
-        res = kzalloc(sizeof(struct resource), GFP_KERNEL);
-
+        res = kzalloc(sizeof(*res), GFP_KERNEL);
         if (res) {
                 rio_init_mbox_res(res, mbox, mbox);
 
                 /* Make sure this outbound mailbox isn't in use */
-                if ((rc =
-                     request_resource(&mport->riores[RIO_OUTB_MBOX_RESOURCE],
-                                      res)) < 0) {
+                rc = request_resource(&mport->riores[RIO_OUTB_MBOX_RESOURCE],
+                                      res);
+                if (rc < 0) {
                         kfree(res);
                         goto out;
                 }
@@ -360,6 +360,7 @@ int rio_request_outb_mbox(struct rio_mport *mport,
       out:
         return rc;
 }
+EXPORT_SYMBOL_GPL(rio_request_outb_mbox);
 
 /**
  * rio_release_outb_mbox - release outbound mailbox message service
@@ -388,6 +389,7 @@ int rio_release_outb_mbox(struct rio_mport *mport, int mbox)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(rio_release_outb_mbox);
 
 /**
  * rio_setup_inb_dbell - bind inbound doorbell callback
@@ -405,13 +407,10 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res,
                     void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src, u16 dst,
                                   u16 info))
 {
-        int rc = 0;
-        struct rio_dbell *dbell;
+        struct rio_dbell *dbell = kmalloc(sizeof(*dbell), GFP_KERNEL);
 
-        if (!(dbell = kmalloc(sizeof(struct rio_dbell), GFP_KERNEL))) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!dbell)
+                return -ENOMEM;
 
         dbell->res = res;
         dbell->dinb = dinb;
@@ -420,9 +419,7 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res,
         mutex_lock(&mport->lock);
         list_add_tail(&dbell->node, &mport->dbells);
         mutex_unlock(&mport->lock);
-
-      out:
-        return rc;
+        return 0;
 }
 
 /**
@@ -444,17 +441,16 @@ int rio_request_inb_dbell(struct rio_mport *mport,
                           void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src,
                                         u16 dst, u16 info))
 {
-        int rc = 0;
-
-        struct resource *res = kzalloc(sizeof(struct resource), GFP_KERNEL);
+        int rc;
+        struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
 
         if (res) {
                 rio_init_dbell_res(res, start, end);
 
                 /* Make sure these doorbells aren't in use */
-                if ((rc =
-                     request_resource(&mport->riores[RIO_DOORBELL_RESOURCE],
-                                      res)) < 0) {
+                rc = request_resource(&mport->riores[RIO_DOORBELL_RESOURCE],
+                                      res);
+                if (rc < 0) {
                         kfree(res);
                         goto out;
                 }
@@ -467,6 +463,7 @@ int rio_request_inb_dbell(struct rio_mport *mport,
       out:
         return rc;
 }
+EXPORT_SYMBOL_GPL(rio_request_inb_dbell);
 
 /**
  * rio_release_inb_dbell - release inbound doorbell message service
@@ -508,6 +505,7 @@ int rio_release_inb_dbell(struct rio_mport *mport, u16 start, u16 end)
       out:
         return rc;
 }
+EXPORT_SYMBOL_GPL(rio_release_inb_dbell);
 
 /**
  * rio_request_outb_dbell - request outbound doorbell message range
@@ -536,6 +534,7 @@ struct resource *rio_request_outb_dbell(struct rio_dev *rdev, u16 start,
 
         return res;
 }
+EXPORT_SYMBOL_GPL(rio_request_outb_dbell);
 
 /**
  * rio_release_outb_dbell - release outbound doorbell message range
@@ -553,6 +552,7 @@ int rio_release_outb_dbell(struct rio_dev *rdev, struct resource *res)
 
         return rc;
 }
+EXPORT_SYMBOL_GPL(rio_release_outb_dbell);
 
 /**
  * rio_add_mport_pw_handler - add port-write message handler into the list
@@ -567,22 +567,17 @@ int rio_add_mport_pw_handler(struct rio_mport *mport, void *context,
                              int (*pwcback)(struct rio_mport *mport,
                              void *context, union rio_pw_msg *msg, int step))
 {
-        int rc = 0;
-        struct rio_pwrite *pwrite;
+        struct rio_pwrite *pwrite = kzalloc(sizeof(*pwrite), GFP_KERNEL);
 
-        pwrite = kzalloc(sizeof(struct rio_pwrite), GFP_KERNEL);
-        if (!pwrite) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!pwrite)
+                return -ENOMEM;
 
         pwrite->pwcback = pwcback;
         pwrite->context = context;
         mutex_lock(&mport->lock);
         list_add_tail(&pwrite->node, &mport->pwrites);
         mutex_unlock(&mport->lock);
-out:
-        return rc;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(rio_add_mport_pw_handler);
 
@@ -632,7 +627,7 @@ int rio_request_inb_pwrite(struct rio_dev *rdev,
         int rc = 0;
 
         spin_lock(&rio_global_list_lock);
-        if (rdev->pwcback != NULL)
+        if (rdev->pwcback)
                 rc = -ENOMEM;
         else
                 rdev->pwcback = pwcback;
@@ -698,7 +693,7 @@ EXPORT_SYMBOL_GPL(rio_pw_enable);
 int rio_map_inb_region(struct rio_mport *mport, dma_addr_t local,
                         u64 rbase, u32 size, u32 rflags)
 {
-        int rc = 0;
+        int rc;
         unsigned long flags;
 
         if (!mport->ops->map_inb)
@@ -742,7 +737,7 @@ EXPORT_SYMBOL_GPL(rio_unmap_inb_region);
 int rio_map_outb_region(struct rio_mport *mport, u16 destid, u64 rbase,
                         u32 size, u32 rflags, dma_addr_t *local)
 {
-        int rc = 0;
+        int rc;
         unsigned long flags;
 
         if (!mport->ops->map_outb)
@@ -975,7 +970,7 @@ rio_chk_dev_route(struct rio_dev *rdev, struct rio_dev **nrdev, int *npnum)
                 rdev = rdev->prev;
         }
 
-        if (prev == NULL)
+        if (!prev)
                 goto err_out;
 
         p_port = prev->rswitch->route_table[rdev->destid];
@@ -1054,7 +1049,7 @@ rio_get_input_status(struct rio_dev *rdev, int pnum, u32 *lnkresp)
                 RIO_MNT_REQ_CMD_IS);
 
         /* Exit if the response is not expected */
-        if (lnkresp == NULL)
+        if (!lnkresp)
                 return 0;
 
         checkcount = 3;
@@ -1411,7 +1406,9 @@ rio_mport_get_feature(struct rio_mport * port, int local, u16 destid,
                                                  ext_ftr_ptr, &ftr_header);
                 if (RIO_GET_BLOCK_ID(ftr_header) == ftr)
                         return ext_ftr_ptr;
-                if (!(ext_ftr_ptr = RIO_GET_BLOCK_PTR(ftr_header)))
+
+                ext_ftr_ptr = RIO_GET_BLOCK_PTR(ftr_header);
+                if (!ext_ftr_ptr)
                         break;
         }
 
@@ -1462,6 +1459,7 @@ struct rio_dev *rio_get_asm(u16 vid, u16 did,
         spin_unlock(&rio_global_list_lock);
         return rdev;
 }
+EXPORT_SYMBOL_GPL(rio_get_asm);
 
 /**
  * rio_get_device - Begin or continue searching for a RIO device by vid/did
@@ -1481,6 +1479,7 @@ struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from)
 {
         return rio_get_asm(vid, did, RIO_ANY_ID, RIO_ANY_ID, from);
 }
+EXPORT_SYMBOL_GPL(rio_get_device);
 
 /**
  * rio_std_route_add_entry - Add switch route table entry using standard
@@ -1696,7 +1695,7 @@ int rio_route_add_entry(struct rio_dev *rdev,
 
         spin_lock(&rdev->rswitch->lock);
 
-        if (ops == NULL || ops->add_entry == NULL) {
+        if (!ops || !ops->add_entry) {
                 rc = rio_std_route_add_entry(rdev->net->hport, rdev->destid,
                                              rdev->hopcount, table,
                                              route_destid, route_port);
@@ -1749,7 +1748,7 @@ int rio_route_get_entry(struct rio_dev *rdev, u16 table,
 
         spin_lock(&rdev->rswitch->lock);
 
-        if (ops == NULL || ops->get_entry == NULL) {
+        if (!ops || !ops->get_entry) {
                 rc = rio_std_route_get_entry(rdev->net->hport, rdev->destid,
                                              rdev->hopcount, table,
                                              route_destid, route_port);
@@ -1797,7 +1796,7 @@ int rio_route_clr_table(struct rio_dev *rdev, u16 table, int lock)
 
         spin_lock(&rdev->rswitch->lock);
 
-        if (ops == NULL || ops->clr_table == NULL) {
+        if (!ops || !ops->clr_table) {
                 rc = rio_std_route_clr_table(rdev->net->hport, rdev->destid,
                                              rdev->hopcount, table);
         } else if (try_module_get(ops->owner)) {
@@ -1889,7 +1888,7 @@ struct dma_async_tx_descriptor *rio_dma_prep_xfer(struct dma_chan *dchan,
 {
         struct rio_dma_ext rio_ext;
 
-        if (dchan->device->device_prep_slave_sg == NULL) {
+        if (!dchan->device->device_prep_slave_sg) {
                 pr_err("%s: prep_rio_sg == NULL\n", __func__);
                 return NULL;
         }
@@ -2189,7 +2188,6 @@ int rio_init_mports(void)
 
         work = kcalloc(n, sizeof *work, GFP_KERNEL);
         if (!work) {
-                pr_err("RIO: no memory for work struct\n");
                 destroy_workqueue(rio_wq);
                 goto no_disc;
         }
@@ -2216,6 +2214,7 @@ no_disc:
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(rio_init_mports);
 
 static int rio_get_hdid(int index)
 {
@@ -2330,16 +2329,3 @@ int rio_unregister_mport(struct rio_mport *port)
         return 0;
 }
 EXPORT_SYMBOL_GPL(rio_unregister_mport);
-
-EXPORT_SYMBOL_GPL(rio_local_get_device_id);
-EXPORT_SYMBOL_GPL(rio_get_device);
-EXPORT_SYMBOL_GPL(rio_get_asm);
-EXPORT_SYMBOL_GPL(rio_request_inb_dbell);
-EXPORT_SYMBOL_GPL(rio_release_inb_dbell);
-EXPORT_SYMBOL_GPL(rio_request_outb_dbell);
-EXPORT_SYMBOL_GPL(rio_release_outb_dbell);
-EXPORT_SYMBOL_GPL(rio_request_inb_mbox);
-EXPORT_SYMBOL_GPL(rio_release_inb_mbox);
-EXPORT_SYMBOL_GPL(rio_request_outb_mbox);
-EXPORT_SYMBOL_GPL(rio_release_outb_mbox);
-EXPORT_SYMBOL_GPL(rio_init_mports);