Merge tag 'fbdev-v4.21' of git://github.com/bzolnier/linux

[platform/kernel/linux-starfive.git] / drivers / target / target_core_stat.c

diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index f0db91e..8d9ceed 100644 (file)
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -246,43 +246,25 @@ static ssize_t target_stat_lu_lu_name_show(struct config_item *item, char *page)
 static ssize_t target_stat_lu_vend_show(struct config_item *item, char *page)
 {
        struct se_device *dev = to_stat_lu_dev(item);
-       int i;
-       char str[sizeof(dev->t10_wwn.vendor)+1];
 
-       /* scsiLuVendorId */
-       for (i = 0; i < sizeof(dev->t10_wwn.vendor); i++)
-               str[i] = ISPRINT(dev->t10_wwn.vendor[i]) ?
-                       dev->t10_wwn.vendor[i] : ' ';
-       str[i] = '\0';
-       return snprintf(page, PAGE_SIZE, "%s\n", str);
+       return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_VENDOR_LEN)
+                       "s\n", dev->t10_wwn.vendor);
 }
 
 static ssize_t target_stat_lu_prod_show(struct config_item *item, char *page)
 {
        struct se_device *dev = to_stat_lu_dev(item);
-       int i;
-       char str[sizeof(dev->t10_wwn.model)+1];
 
-       /* scsiLuProductId */
-       for (i = 0; i < sizeof(dev->t10_wwn.model); i++)
-               str[i] = ISPRINT(dev->t10_wwn.model[i]) ?
-                       dev->t10_wwn.model[i] : ' ';
-       str[i] = '\0';
-       return snprintf(page, PAGE_SIZE, "%s\n", str);
+       return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_MODEL_LEN)
+                       "s\n", dev->t10_wwn.model);
 }
 
 static ssize_t target_stat_lu_rev_show(struct config_item *item, char *page)
 {
        struct se_device *dev = to_stat_lu_dev(item);
-       int i;
-       char str[sizeof(dev->t10_wwn.revision)+1];
 
-       /* scsiLuRevisionId */
-       for (i = 0; i < sizeof(dev->t10_wwn.revision); i++)
-               str[i] = ISPRINT(dev->t10_wwn.revision[i]) ?
-                       dev->t10_wwn.revision[i] : ' ';
-       str[i] = '\0';
-       return snprintf(page, PAGE_SIZE, "%s\n", str);
+       return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_REVISION_LEN)
+                       "s\n", dev->t10_wwn.revision);
 }
 
 static ssize_t target_stat_lu_dev_type_show(struct config_item *item, char *page)
@@ -612,7 +594,7 @@ static ssize_t target_stat_tgt_port_name_show(struct config_item *item,
        dev = rcu_dereference(lun->lun_se_dev);
        if (dev)
                ret = snprintf(page, PAGE_SIZE, "%sPort#%u\n",
-                       tpg->se_tpg_tfo->get_fabric_name(),
+                       tpg->se_tpg_tfo->fabric_name,
                        lun->lun_rtpi);
        rcu_read_unlock();
        return ret;
@@ -767,7 +749,7 @@ static ssize_t target_stat_transport_device_show(struct config_item *item,
        if (dev) {
                /* scsiTransportType */
                ret = snprintf(page, PAGE_SIZE, "scsiTransport%s\n",
-                              tpg->se_tpg_tfo->get_fabric_name());
+                              tpg->se_tpg_tfo->fabric_name);
        }
        rcu_read_unlock();
        return ret;