openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: visorbus: move error store/show functions 

Move the show and store functions for the error DEV_ATTR_RW so that the
function prototypes can be removed.

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>
This commit is contained in:
David Kershner 2016-09-19 17:09:31 -04:00 committed by Greg Kroah-Hartman
parent 65cb1a8c54
commit 8a4a8a03d3
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -256,9 +256,35 @@ static ssize_t boottotool_store(struct device *dev,
static DEVICE_ATTR_RW(boottotool); static DEVICE_ATTR_RW(boottotool);
static ssize_t error_show(struct device *dev, struct device_attribute *attr, static ssize_t error_show(struct device *dev, struct device_attribute *attr,
char *buf); char *buf)
{
u32 error = 0;
visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
installation_error),
&error, sizeof(u32));
return scnprintf(buf, PAGE_SIZE, "%i\n", error);
}
static ssize_t error_store(struct device *dev, struct device_attribute *attr, static ssize_t error_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count); const char *buf, size_t count)
{
u32 error;
int ret;
if (kstrtou32(buf, 10, &error))
return -EINVAL;
ret = visorchannel_write
(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
installation_error),
&error, sizeof(u32));
if (ret)
return ret;
return count;
}
static DEVICE_ATTR_RW(error); static DEVICE_ATTR_RW(error);
static ssize_t textid_show(struct device *dev, struct device_attribute *attr, static ssize_t textid_show(struct device *dev, struct device_attribute *attr,
@ -423,37 +449,6 @@ parser_string_get(struct parser_context *ctx)
return value; return value;
} }
static ssize_t error_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
u32 error = 0;
visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
installation_error),
&error, sizeof(u32));
return scnprintf(buf, PAGE_SIZE, "%i\n", error);
}
static ssize_t error_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
u32 error;
int ret;
if (kstrtou32(buf, 10, &error))
return -EINVAL;
ret = visorchannel_write
(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
installation_error),
&error, sizeof(u32));
if (ret)
return ret;
return count;
}
static ssize_t textid_show(struct device *dev, struct device_attribute *attr, static ssize_t textid_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {