Commit 755e2ecc authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: replace typedef ULTRA_EFI_SPAR_INDICATION 



Replace ULTRA_EFI_SPAR_INDICATION with struct efi_spar_indication, and
update references to the old type.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18787366

drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h

+4 −4
Original line number Diff line number Diff line
@@ -150,13 +150,13 @@ struct pci_id { 
	u8 reserved[3];	/* Natural alignment purposes */

};



typedef struct _ULTRA_EFI_SPAR_INDICATION  {

struct efi_spar_indication  {

	u64 BootToFirmwareUI:1;	/* Bit 0: Stop in uefi ui */

	u64 ClearNvram:1;	/* Bit 1: Clear NVRAM */

	u64 ClearCmos:1;	/* Bit 2: Clear CMOS */

	u64 BootToTool:1;	/* Bit 3: Run install tool */

	/* remaining bits are available */

} ULTRA_EFI_SPAR_INDICATION;

};



typedef enum {

	ULTRA_CHIPSET_FEATURE_REPLY = 0x00000001,
@@ -468,8 +468,8 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { 
	u8 ToolAction;		/* ULTRA_TOOL_ACTIONS Installation Action

				 * field */

	u8 Reserved;		/* alignment */

	ULTRA_EFI_SPAR_INDICATION EfiSparIndication;

	ULTRA_EFI_SPAR_INDICATION EfiSparIndicationSupported;

	struct efi_spar_indication EfiSparIndication;

	struct efi_spar_indication EfiSparIndicationSupported;

	u32 SPReserved;

	u8 Reserved2[28];	/* Force signals to begin on 128-byte cache

				 * line */

drivers/staging/unisys/visorchipset/visorchipset_main.c

+4 −4
Original line number Diff line number Diff line
@@ -386,12 +386,12 @@ static ssize_t boottotool_show(struct device *dev, 
			       struct device_attribute *attr,

			       char *buf)

{

	ULTRA_EFI_SPAR_INDICATION efiSparIndication;

	struct efi_spar_indication efiSparIndication;



	visorchannel_read(ControlVm_channel,

		offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,

			EfiSparIndication), &efiSparIndication,

		sizeof(ULTRA_EFI_SPAR_INDICATION));

		sizeof(struct efi_spar_indication));

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

			efiSparIndication.BootToTool);

}
@@ -401,7 +401,7 @@ static ssize_t boottotool_store(struct device *dev, 
				const char *buf, size_t count)

{

	int val, ret;

	ULTRA_EFI_SPAR_INDICATION efiSparIndication;

	struct efi_spar_indication efiSparIndication;



	if (kstrtoint(buf, 10, &val) != 0)

		return -EINVAL;
@@ -411,7 +411,7 @@ static ssize_t boottotool_store(struct device *dev, 
			offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,

				EfiSparIndication),

			&(efiSparIndication),

		sizeof(ULTRA_EFI_SPAR_INDICATION));

		sizeof(struct efi_spar_indication));



	if (ret)

		return ret;