]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPI: button: Use local pointer to platform device dev field in probe
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Jun 2026 17:01:41 +0000 (19:01 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Jun 2026 17:17:49 +0000 (19:17 +0200)
To avoid dereferencing pdev to get to the target platform device's
dev field in multiple places in acpi_button_probe(), use a local pointer
to that field.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2049596.PYKUYFuaPT@rafael.j.wysocki
drivers/acpi/button.c

index 236eb025bb0dcb45be2977028947d0bb83ff022a..9fe8d212b606c70f02754d7162a9b3881acbdcac 100644 (file)
@@ -541,6 +541,7 @@ static int acpi_lid_input_open(struct input_dev *input)
 
 static int acpi_button_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        acpi_notify_handler handler;
        struct acpi_device *device;
        struct acpi_button *button;
@@ -550,7 +551,7 @@ static int acpi_button_probe(struct platform_device *pdev)
        const char *hid;
        int error = 0;
 
-       device = ACPI_COMPANION(&pdev->dev);
+       device = ACPI_COMPANION(dev);
        if (!device)
                return -ENODEV;
 
@@ -565,7 +566,7 @@ static int acpi_button_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, button);
 
-       button->dev = &pdev->dev;
+       button->dev = dev;
        button->adev = device;
        button->input = input = input_allocate_device();
        if (!input) {
@@ -615,7 +616,7 @@ static int acpi_button_probe(struct platform_device *pdev)
        input->phys = button->phys;
        input->id.bustype = BUS_HOST;
        input->id.product = button->type;
-       input->dev.parent = &pdev->dev;
+       input->dev.parent = dev;
 
        switch (button->type) {
        case ACPI_BUTTON_TYPE_POWER: