Commit 79730c7c authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

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: 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 8a4a8a03

drivers/staging/unisys/visorbus/visorchipset.c

+29 −34
Original line number Diff line number Diff line
@@ -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)

{