IB/srpt: Inline srpt_sdev_name()
authorBart Van Assche <bart.vanassche@sandisk.com>
Thu, 11 Feb 2016 19:04:20 +0000 (11:04 -0800)
committerDoug Ledford <dledford@redhat.com>
Mon, 29 Feb 2016 22:12:34 +0000 (17:12 -0500)
srpt_sdev_name() is too trivial to keep it as a separate function.
Hence inline this function.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Cc: Alex Estrin <alex.estrin@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/ulp/srpt/ib_srpt.c

index 9f5cd3ff3fcb2fcc5efdfe69f565e1ab6be53ad5..babc15b1795ddf9f1189dd69938593950bcf5db8 100644 (file)
@@ -109,16 +109,6 @@ enum dma_data_direction opposite_dma_dir(enum dma_data_direction dir)
        }
 }
 
-/**
- * srpt_sdev_name() - Return the name associated with the HCA.
- *
- * Examples are ib0, ib1, ...
- */
-static inline const char *srpt_sdev_name(struct srpt_device *sdev)
-{
-       return sdev->device->name;
-}
-
 static enum rdma_ch_state srpt_get_ch_state(struct srpt_rdma_ch *ch)
 {
        unsigned long flags;
@@ -182,7 +172,7 @@ static void srpt_event_handler(struct ib_event_handler *handler,
                return;
 
        pr_debug("ASYNC event= %d on device= %s\n", event->event,
-                srpt_sdev_name(sdev));
+                sdev->device->name);
 
        switch (event->event) {
        case IB_EVENT_PORT_ERR:
@@ -3025,7 +3015,7 @@ static void srpt_add_one(struct ib_device *device)
 
                if (srpt_refresh_port(sport)) {
                        pr_err("MAD registration failed for %s-%d.\n",
-                              srpt_sdev_name(sdev), i);
+                              sdev->device->name, i);
                        goto err_ring;
                }
                snprintf(sport->port_guid, sizeof(sport->port_guid),