mirror of
https://github.com/torvalds/linux.git
synced 2026-09-24 06:24:02 +02:00
platform/x86: fujitsu-laptop: Stop setting acpi_device_name/class()
The driver sets acpi_device_name() that are only used for printing messages and initializing input class device names. Since ACPI_FUJITSU_BL_DEVICE_NAME and ACPI_FUJITSU_LAPTOP_DEVICE_NAME can be used directly in all of those cases, make the driver do so and stop setting acpi_device_name() in it. Likewise, acpi_device_class() set by the driver are never read afterward, so make the driver stop setting it and drop the symbol defined specifically for this purpose. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Jonathan Woithe <jwoithe@just42.net> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/3441919.aeNJFYEL58@rafael.j.wysocki Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
parent
073bab8ee7
commit
e235507af5
|
|
@ -56,7 +56,6 @@
|
|||
|
||||
#define FUJITSU_LCD_N_LEVELS 8
|
||||
|
||||
#define ACPI_FUJITSU_CLASS "fujitsu"
|
||||
#define ACPI_FUJITSU_BL_HID "FUJ02B1"
|
||||
#define ACPI_FUJITSU_BL_DRIVER_NAME "Fujitsu laptop FUJ02B1 ACPI brightness driver"
|
||||
#define ACPI_FUJITSU_BL_DEVICE_NAME "Fujitsu FUJ02B1"
|
||||
|
|
@ -466,7 +465,7 @@ static int acpi_fujitsu_bl_input_setup(struct device *dev)
|
|||
snprintf(priv->phys, sizeof(priv->phys), "%s/video/input0",
|
||||
acpi_device_hid(device));
|
||||
|
||||
priv->input->name = acpi_device_name(device);
|
||||
priv->input->name = ACPI_FUJITSU_BL_DEVICE_NAME;
|
||||
priv->input->phys = priv->phys;
|
||||
priv->input->id.bustype = BUS_HOST;
|
||||
priv->input->id.product = 0x06;
|
||||
|
|
@ -546,13 +545,11 @@ static int acpi_fujitsu_bl_probe(struct platform_device *pdev)
|
|||
return -ENOMEM;
|
||||
|
||||
fujitsu_bl = priv;
|
||||
strscpy(acpi_device_name(device), ACPI_FUJITSU_BL_DEVICE_NAME);
|
||||
strscpy(acpi_device_class(device), ACPI_FUJITSU_CLASS);
|
||||
|
||||
platform_set_drvdata(pdev, priv);
|
||||
|
||||
pr_info("ACPI: %s [%s]\n",
|
||||
acpi_device_name(device), acpi_device_bid(device));
|
||||
pr_info("ACPI: %s [%s]\n", ACPI_FUJITSU_BL_DEVICE_NAME,
|
||||
acpi_device_bid(device));
|
||||
|
||||
if (get_max_brightness(&pdev->dev) <= 0)
|
||||
priv->max_brightness = FUJITSU_LCD_N_LEVELS;
|
||||
|
|
@ -681,7 +678,7 @@ static int acpi_fujitsu_laptop_input_setup(struct device *dev)
|
|||
snprintf(priv->phys, sizeof(priv->phys), "%s/input0",
|
||||
acpi_device_hid(device));
|
||||
|
||||
priv->input->name = acpi_device_name(device);
|
||||
priv->input->name = ACPI_FUJITSU_LAPTOP_DEVICE_NAME;
|
||||
priv->input->phys = priv->phys;
|
||||
priv->input->id.bustype = BUS_HOST;
|
||||
|
||||
|
|
@ -1012,9 +1009,6 @@ static int acpi_fujitsu_laptop_probe(struct platform_device *pdev)
|
|||
WARN_ONCE(fext, "More than one FUJ02E3 ACPI device was found. Driver may not work as intended.");
|
||||
fext = &pdev->dev;
|
||||
|
||||
strscpy(acpi_device_name(device), ACPI_FUJITSU_LAPTOP_DEVICE_NAME);
|
||||
strscpy(acpi_device_class(device), ACPI_FUJITSU_CLASS);
|
||||
|
||||
platform_set_drvdata(pdev, priv);
|
||||
|
||||
/* kfifo */
|
||||
|
|
@ -1024,8 +1018,8 @@ static int acpi_fujitsu_laptop_probe(struct platform_device *pdev)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
pr_info("ACPI: %s [%s]\n",
|
||||
acpi_device_name(device), acpi_device_bid(device));
|
||||
pr_info("ACPI: %s [%s]\n", ACPI_FUJITSU_LAPTOP_DEVICE_NAME,
|
||||
acpi_device_bid(device));
|
||||
|
||||
while (call_fext_func(fext, FUNC_BUTTONS, 0x1, 0x0, 0x0) != 0 &&
|
||||
i++ < MAX_HOTKEY_RINGBUFFER_SIZE)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user