diff options
| author | David Kershner | 2016-09-19 23:09:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-20 13:28:17 +0200 |
| commit | 79730c7c8148f68144540181b8b53b1e9639f9b7 (patch) | |
| tree | 8f429d4c17aa16d3dd78bd6e798b82d9c20da517 /drivers/staging/unisys/visorbus/visorchipset.c | |
| parent | staging: unisys: visorbus: move error store/show functions (diff) | |
| download | kernel-qcow2-linux-79730c7c8148f68144540181b8b53b1e9639f9b7.tar.gz kernel-qcow2-linux-79730c7c8148f68144540181b8b53b1e9639f9b7.tar.xz kernel-qcow2-linux-79730c7c8148f68144540181b8b53b1e9639f9b7.zip | |
staging: unisys: visorbus: move textid store and show functions
The textid store and show functions were moved to allow us to remove
the function prototypes.
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorbus/visorchipset.c')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorchipset.c | 63 |
1 files changed, 29 insertions, 34 deletions
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 951eaea8ad9b..5ba5f1970688 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -288,9 +288,36 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RW(error); static ssize_t textid_show(struct device *dev, struct device_attribute *attr, - char *buf); + char *buf) +{ + u32 text_id = 0; + + visorchannel_read + (controlvm_channel, + offsetof(struct spar_controlvm_channel_protocol, + installation_text_id), + &text_id, sizeof(u32)); + return scnprintf(buf, PAGE_SIZE, "%i\n", text_id); +} + static ssize_t textid_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count); + const char *buf, size_t count) +{ + u32 text_id; + int ret; + + if (kstrtou32(buf, 10, &text_id)) + return -EINVAL; + + ret = visorchannel_write + (controlvm_channel, + offsetof(struct spar_controlvm_channel_protocol, + installation_text_id), + &text_id, sizeof(u32)); + if (ret) + return ret; + return count; +} static DEVICE_ATTR_RW(textid); static ssize_t remaining_steps_show(struct device *dev, @@ -449,38 +476,6 @@ parser_string_get(struct parser_context *ctx) return value; } -static ssize_t textid_show(struct device *dev, struct device_attribute *attr, - char *buf) -{ - u32 text_id = 0; - - visorchannel_read - (controlvm_channel, - offsetof(struct spar_controlvm_channel_protocol, - installation_text_id), - &text_id, sizeof(u32)); - return scnprintf(buf, PAGE_SIZE, "%i\n", text_id); -} - -static ssize_t textid_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) -{ - u32 text_id; - int ret; - - if (kstrtou32(buf, 10, &text_id)) - return -EINVAL; - - ret = visorchannel_write - (controlvm_channel, - offsetof(struct spar_controlvm_channel_protocol, - installation_text_id), - &text_id, sizeof(u32)); - if (ret) - return ret; - return count; -} - static ssize_t remaining_steps_show(struct device *dev, struct device_attribute *attr, char *buf) { |