diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-01-24 22:22:19 +0200 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2019-02-09 19:48:43 -0600 |
| commit | 16ccdb552e70e7ae231e7934699fc217e8035d6f (patch) | |
| tree | 7b2ad4d31ac2567703ea0fdf6e5d150ce3bff996 /drivers/char/ipmi/ipmi_msghandler.c | |
| parent | 83af41947c5cbdf33c78f4818bb0cb23da39d132 (diff) | |
| download | lwn-16ccdb552e70e7ae231e7934699fc217e8035d6f.tar.gz lwn-16ccdb552e70e7ae231e7934699fc217e8035d6f.zip | |
ipmi: Use defined constant for UUID representation
Instead of magic number use pre-defined constant for UUID binary and
string representations.
While here, drop the implementation details of guid_t type.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
[Also converted a "17" in the error string to UUID_SIZE + 1]
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char/ipmi/ipmi_msghandler.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 5bc84fbbeee5..79911914c1cb 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -2749,7 +2749,7 @@ static ssize_t guid_show(struct device *dev, struct device_attribute *attr, if (!guid_set) return -ENOENT; - return snprintf(buf, 38, "%pUl\n", guid.b); + return snprintf(buf, UUID_STRING_LEN + 1 + 1, "%pUl\n", &guid); } static DEVICE_ATTR_RO(guid); @@ -3148,11 +3148,11 @@ static void guid_handler(struct ipmi_smi *intf, struct ipmi_recv_msg *msg) goto out; } - if (msg->msg.data_len < 17) { + if (msg->msg.data_len < UUID_SIZE + 1) { bmc->dyn_guid_set = 0; dev_warn(intf->si_dev, - "The GUID response from the BMC was too short, it was %d but should have been 17. Assuming GUID is not available.\n", - msg->msg.data_len); + "The GUID response from the BMC was too short, it was %d but should have been %d. Assuming GUID is not available.\n", + msg->msg.data_len, UUID_SIZE + 1); goto out; } |