Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bf9310a authored by Darren Hart (VMware)'s avatar Darren Hart (VMware)
Browse files

platform/x86: hp-wmi: Cleanup local variable declarations 



Declare like types on one line. Order declarations in decreasing length
where possible.

Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Tested-by: default avatarCarlo Caione <carlo@endlessm.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent d3138769

drivers/platform/x86/hp-wmi.c

+13 −16
Original line number Diff line number Diff line
@@ -346,15 +346,14 @@ static const struct rfkill_ops hp_wmi_rfkill_ops = { 


static bool hp_wmi_get_sw_state(enum hp_wmi_radio r)

{

	int mask = 0x200 << (r * 8);

	int wireless = 0;

	int mask;



	hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0,

			     &wireless, sizeof(wireless),

			     sizeof(wireless));

	/* TBD: Pass error */



	mask = 0x200 << (r * 8);



	if (wireless & mask)

		return false;

	else
@@ -363,15 +362,14 @@ static bool hp_wmi_get_sw_state(enum hp_wmi_radio r) 


static bool hp_wmi_get_hw_state(enum hp_wmi_radio r)

{

	int mask = 0x800 << (r * 8);

	int wireless = 0;

	int mask;



	hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0,

			     &wireless, sizeof(wireless),

			     sizeof(wireless));

	/* TBD: Pass error */



	mask = 0x800 << (r * 8);



	if (wireless & mask)

		return false;

	else
@@ -395,8 +393,8 @@ static const struct rfkill_ops hp_wmi_rfkill2_ops = { 


static int hp_wmi_rfkill2_refresh(void)

{

	int err, i;

	struct bios_rfkill2_state state;

	int err, i;



	err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, 0, &state,

				   0, sizeof(state));
@@ -502,9 +500,9 @@ static ssize_t set_als(struct device *dev, struct device_attribute *attr, 
static ssize_t set_postcode(struct device *dev, struct device_attribute *attr,

		       const char *buf, size_t count)

{

	long unsigned int tmp2;

	int ret;

	u32 tmp;

	long unsigned int tmp2;



	ret = kstrtoul(buf, 10, &tmp2);

	if (ret || tmp2 != 1)
@@ -530,11 +528,11 @@ static DEVICE_ATTR(postcode, S_IRUGO | S_IWUSR, show_postcode, set_postcode); 
static void hp_wmi_notify(u32 value, void *context)

{

	struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;

	u32 event_id, event_data;

	union acpi_object *obj;

	int key_code = 0, ret;

	u32 *location;

	acpi_status status;

	u32 *location;



	status = wmi_get_event_data(value, &response);

	if (status != AE_OK) {
@@ -645,8 +643,7 @@ static void hp_wmi_notify(u32 value, void *context) 
static int __init hp_wmi_input_setup(void)

{

	acpi_status status;

	int err;

	int val;

	int err, val;



	hp_wmi_input_dev = input_allocate_device();

	if (!hp_wmi_input_dev)
@@ -719,8 +716,7 @@ static void cleanup_sysfs(struct platform_device *device) 


static int __init hp_wmi_rfkill_setup(struct platform_device *device)

{

	int err;

	int wireless = 0;

	int err, wireless = 0;



	err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, &wireless,

				   sizeof(wireless), sizeof(wireless));
@@ -804,8 +800,9 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device) 


static int __init hp_wmi_rfkill2_setup(struct platform_device *device)

{

	int err, i;

	struct bios_rfkill2_state state;

	int err, i;



	err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, 0, &state,

				   0, sizeof(state));

	if (err)
@@ -1002,9 +999,9 @@ static struct platform_driver hp_wmi_driver = { 


static int __init hp_wmi_init(void)

{

	int err;

	int event_capable = wmi_has_guid(HPWMI_EVENT_GUID);

	int bios_capable = wmi_has_guid(HPWMI_BIOS_GUID);

	int err;



	if (!bios_capable && !event_capable)

		return -ENODEV;