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

Commit 7ec3b54d authored by Michał Kępień's avatar Michał Kępień Committed by Darren Hart (VMware)
Browse files

platform/x86: fujitsu-laptop: distinguish current uses of device-specific data 



In portions of the driver which use device-specific data, rename local
variables from fujitsu_bl and fujitsu_laptop to priv in order to clearly
distinguish these parts from code that uses module-wide data.

Signed-off-by: default avatarMichał Kępień <kernel@kempniu.pl>
Reviewed-by: default avatarJonathan Woithe <jwoithe@just42.net>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 251ebd03

drivers/platform/x86/fujitsu-laptop.c

+24 −24
Original line number Diff line number Diff line
@@ -348,26 +348,26 @@ static const struct key_entry keymap_backlight[] = { 


static int acpi_fujitsu_bl_input_setup(struct acpi_device *device)

{

	struct fujitsu_bl *fujitsu_bl = acpi_driver_data(device);

	struct fujitsu_bl *priv = acpi_driver_data(device);

	int ret;



	fujitsu_bl->input = devm_input_allocate_device(&device->dev);

	if (!fujitsu_bl->input)

	priv->input = devm_input_allocate_device(&device->dev);

	if (!priv->input)

		return -ENOMEM;



	snprintf(fujitsu_bl->phys, sizeof(fujitsu_bl->phys),

		 "%s/video/input0", acpi_device_hid(device));

	snprintf(priv->phys, sizeof(priv->phys), "%s/video/input0",

		 acpi_device_hid(device));



	fujitsu_bl->input->name = acpi_device_name(device);

	fujitsu_bl->input->phys = fujitsu_bl->phys;

	fujitsu_bl->input->id.bustype = BUS_HOST;

	fujitsu_bl->input->id.product = 0x06;

	priv->input->name = acpi_device_name(device);

	priv->input->phys = priv->phys;

	priv->input->id.bustype = BUS_HOST;

	priv->input->id.product = 0x06;



	ret = sparse_keymap_setup(fujitsu_bl->input, keymap_backlight, NULL);

	ret = sparse_keymap_setup(priv->input, keymap_backlight, NULL);

	if (ret)

		return ret;



	return input_register_device(fujitsu_bl->input);

	return input_register_device(priv->input);

}



static int fujitsu_backlight_register(struct acpi_device *device)
@@ -541,27 +541,27 @@ static const struct dmi_system_id fujitsu_laptop_dmi_table[] = { 


static int acpi_fujitsu_laptop_input_setup(struct acpi_device *device)

{

	struct fujitsu_laptop *fujitsu_laptop = acpi_driver_data(device);

	struct fujitsu_laptop *priv = acpi_driver_data(device);

	int ret;



	fujitsu_laptop->input = devm_input_allocate_device(&device->dev);

	if (!fujitsu_laptop->input)

	priv->input = devm_input_allocate_device(&device->dev);

	if (!priv->input)

		return -ENOMEM;



	snprintf(fujitsu_laptop->phys, sizeof(fujitsu_laptop->phys),

		 "%s/video/input0", acpi_device_hid(device));

	snprintf(priv->phys, sizeof(priv->phys), "%s/video/input0",

		 acpi_device_hid(device));



	fujitsu_laptop->input->name = acpi_device_name(device);

	fujitsu_laptop->input->phys = fujitsu_laptop->phys;

	fujitsu_laptop->input->id.bustype = BUS_HOST;

	fujitsu_laptop->input->id.product = 0x06;

	priv->input->name = acpi_device_name(device);

	priv->input->phys = priv->phys;

	priv->input->id.bustype = BUS_HOST;

	priv->input->id.product = 0x06;



	dmi_check_system(fujitsu_laptop_dmi_table);

	ret = sparse_keymap_setup(fujitsu_laptop->input, keymap, NULL);

	ret = sparse_keymap_setup(priv->input, keymap, NULL);

	if (ret)

		return ret;



	return input_register_device(fujitsu_laptop->input);

	return input_register_device(priv->input);

}



static int fujitsu_laptop_platform_add(void)
@@ -863,11 +863,11 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) 


static int acpi_fujitsu_laptop_remove(struct acpi_device *device)

{

	struct fujitsu_laptop *fujitsu_laptop = acpi_driver_data(device);

	struct fujitsu_laptop *priv = acpi_driver_data(device);



	fujitsu_laptop_platform_remove();



	kfifo_free(&fujitsu_laptop->fifo);

	kfifo_free(&priv->fifo);



	return 0;

}