Commit 8d7da1d8 authored by Alexander Curtin's avatar Alexander Curtin Committed by Greg Kroah-Hartman

staging: unisys: visorbus: replaced vague 'p' variable with 'pos'

In the case of client_bus_info_show, the variable 'p' was used to
indicate the position in the output buffer. This was changed to 'pos' to
indicate that it kept track of the current position in the output
buffer.
Signed-off-by: default avatarAlexander Curtin <alexander.curtin@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62f3dc85
...@@ -422,7 +422,7 @@ static ssize_t client_bus_info_show(struct device *dev, ...@@ -422,7 +422,7 @@ static ssize_t client_bus_info_show(struct device *dev,
int i, x, remain = PAGE_SIZE; int i, x, remain = PAGE_SIZE;
unsigned long off; unsigned long off;
char *p = buf; char *pos = buf;
u8 *partition_name; u8 *partition_name;
struct ultra_vbus_deviceinfo dev_info; struct ultra_vbus_deviceinfo dev_info;
...@@ -430,10 +430,10 @@ static ssize_t client_bus_info_show(struct device *dev, ...@@ -430,10 +430,10 @@ static ssize_t client_bus_info_show(struct device *dev,
if (channel) { if (channel) {
if (vdev->name) if (vdev->name)
partition_name = vdev->name; partition_name = vdev->name;
x = snprintf(p, remain, x = snprintf(pos, remain,
"Client device / client driver info for %s partition (vbus #%d):\n", "Client device / client driver info for %s partition (vbus #%d):\n",
partition_name, vdev->chipset_dev_no); partition_name, vdev->chipset_dev_no);
p += x; pos += x;
remain -= x; remain -= x;
x = visorchannel_read(channel, x = visorchannel_read(channel,
offsetof(struct offsetof(struct
...@@ -441,9 +441,9 @@ static ssize_t client_bus_info_show(struct device *dev, ...@@ -441,9 +441,9 @@ static ssize_t client_bus_info_show(struct device *dev,
chp_info), chp_info),
&dev_info, sizeof(dev_info)); &dev_info, sizeof(dev_info));
if (x >= 0) { if (x >= 0) {
x = vbuschannel_devinfo_to_string(&dev_info, p, x = vbuschannel_devinfo_to_string(&dev_info, pos,
remain, -1); remain, -1);
p += x; pos += x;
remain -= x; remain -= x;
} }
x = visorchannel_read(channel, x = visorchannel_read(channel,
...@@ -452,9 +452,9 @@ static ssize_t client_bus_info_show(struct device *dev, ...@@ -452,9 +452,9 @@ static ssize_t client_bus_info_show(struct device *dev,
bus_info), bus_info),
&dev_info, sizeof(dev_info)); &dev_info, sizeof(dev_info));
if (x >= 0) { if (x >= 0) {
x = vbuschannel_devinfo_to_string(&dev_info, p, x = vbuschannel_devinfo_to_string(&dev_info, pos,
remain, -1); remain, -1);
p += x; pos += x;
remain -= x; remain -= x;
} }
off = offsetof(struct spar_vbus_channel_protocol, dev_info); off = offsetof(struct spar_vbus_channel_protocol, dev_info);
...@@ -465,8 +465,8 @@ static ssize_t client_bus_info_show(struct device *dev, ...@@ -465,8 +465,8 @@ static ssize_t client_bus_info_show(struct device *dev,
off, &dev_info, sizeof(dev_info)); off, &dev_info, sizeof(dev_info));
if (x >= 0) { if (x >= 0) {
x = vbuschannel_devinfo_to_string x = vbuschannel_devinfo_to_string
(&dev_info, p, remain, i); (&dev_info, pos, remain, i);
p += x; pos += x;
remain -= x; remain -= x;
} }
off += sizeof(dev_info); off += sizeof(dev_info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment