Commit 8a4a8a03 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <Timothy.Sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65cb1a8c

drivers/staging/unisys/visorbus/visorchipset.c

+28 −33
Original line number Diff line number Diff line
@@ -256,9 +256,35 @@ static ssize_t boottotool_store(struct device *dev, 
static DEVICE_ATTR_RW(boottotool);



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,

			   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 ssize_t textid_show(struct device *dev, struct device_attribute *attr,
@@ -423,37 +449,6 @@ parser_string_get(struct parser_context *ctx) 
	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,

			   char *buf)

{