kernel-doc: detect/prevent duplicate doc section names

[linux-2.6-omap-h63xx.git] / drivers / s390 / sysinfo.c

diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c
index 43fffa3b099dda5bf3b6cbc43e88b235e338c8b8..c3e4ab07b9ccc4e9e1df807ada9e0c5341f76ad2 100644 (file)
--- a/drivers/s390/sysinfo.c
+++ b/drivers/s390/sysinfo.c
@@ -35,6 +35,8 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
        EBCASC(info->sequence, sizeof(info->sequence));
        EBCASC(info->plant, sizeof(info->plant));
        EBCASC(info->model_capacity, sizeof(info->model_capacity));
+       EBCASC(info->model_perm_cap, sizeof(info->model_perm_cap));
+       EBCASC(info->model_temp_cap, sizeof(info->model_temp_cap));
        len += sprintf(page + len, "Manufacturer:         %-16.16s\n",
                       info->manufacturer);
        len += sprintf(page + len, "Type:                 %-4.4s\n",
@@ -57,8 +59,18 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
                       info->sequence);
        len += sprintf(page + len, "Plant:                %-4.4s\n",
                       info->plant);
-       len += sprintf(page + len, "Model Capacity:       %-16.16s\n",
-                      info->model_capacity);
+       len += sprintf(page + len, "Model Capacity:       %-16.16s %08u\n",
+                      info->model_capacity, *(u32 *) info->model_cap_rating);
+       if (info->model_perm_cap[0] != '\0')
+               len += sprintf(page + len,
+                              "Model Perm. Capacity: %-16.16s %08u\n",
+                              info->model_perm_cap,
+                              *(u32 *) info->model_perm_cap_rating);
+       if (info->model_temp_cap[0] != '\0')
+               len += sprintf(page + len,
+                              "Model Temp. Capacity: %-16.16s %08u\n",
+                              info->model_temp_cap,
+                              *(u32 *) info->model_temp_cap_rating);
        return len;
 }