Commit 1b1d463d authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: move boottotool 



Move the boottotool show and store functions so 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 84efd207

drivers/staging/unisys/visorbus/visorchipset.c

+33 −39
Original line number Original line Diff line number Diff line
@@ -219,10 +219,40 @@ static ssize_t toolaction_store(struct device *dev, 
static DEVICE_ATTR_RW(toolaction);

static DEVICE_ATTR_RW(toolaction);





static ssize_t boottotool_show(struct device *dev,

static ssize_t boottotool_show(struct device *dev,

			       struct device_attribute *attr, char *buf);

			       struct device_attribute *attr,

			       char *buf)

{

	struct efi_spar_indication efi_spar_indication;



	visorchannel_read(controlvm_channel,

			  offsetof(struct spar_controlvm_channel_protocol,

				   efi_spar_ind), &efi_spar_indication,

			  sizeof(struct efi_spar_indication));

	return scnprintf(buf, PAGE_SIZE, "%u\n",

			 efi_spar_indication.boot_to_tool);

}



static ssize_t boottotool_store(struct device *dev,

static ssize_t boottotool_store(struct device *dev,

				struct device_attribute *attr, const char *buf,

				struct device_attribute *attr,

				size_t count);

				const char *buf, size_t count)

{

	int val, ret;

	struct efi_spar_indication efi_spar_indication;



	if (kstrtoint(buf, 10, &val))

		return -EINVAL;



	efi_spar_indication.boot_to_tool = val;

	ret = visorchannel_write

		(controlvm_channel,

		 offsetof(struct spar_controlvm_channel_protocol,

			  efi_spar_ind), &(efi_spar_indication),

		 sizeof(struct efi_spar_indication));



	if (ret)

		return ret;

	return count;

}

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,
@@ -458,42 +488,6 @@ parser_string_get(struct parser_context *ctx) 
	return value;

	return value;

}

}





static ssize_t boottotool_show(struct device *dev,

			       struct device_attribute *attr,

			       char *buf)

{

	struct efi_spar_indication efi_spar_indication;



	visorchannel_read(controlvm_channel,

			  offsetof(struct spar_controlvm_channel_protocol,

				   efi_spar_ind), &efi_spar_indication,

			  sizeof(struct efi_spar_indication));

	return scnprintf(buf, PAGE_SIZE, "%u\n",

			 efi_spar_indication.boot_to_tool);

}



static ssize_t boottotool_store(struct device *dev,

				struct device_attribute *attr,

				const char *buf, size_t count)

{

	int val, ret;

	struct efi_spar_indication efi_spar_indication;



	if (kstrtoint(buf, 10, &val))

		return -EINVAL;



	efi_spar_indication.boot_to_tool = val;

	ret = visorchannel_write

		(controlvm_channel,

		 offsetof(struct spar_controlvm_channel_protocol,

			  efi_spar_ind), &(efi_spar_indication),

		 sizeof(struct efi_spar_indication));



	if (ret)

		return ret;

	return count;

}



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)

{

{