pinctrl: cherryview: fix address_space_handler() argument

First argument of acpi_*_address_space_handler() APIs is acpi_handle of
the device, which is incorrectly passed in driver ->remove() path here.
Fix it by passing the appropriate argument and while at it, make both
API calls consistent using ACPI_HANDLE().

Fixes: a0b028597d59 ("pinctrl: cherryview: Add support for GMMR GPIO opregion")
Cc: stable@vger.kernel.org
Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index 55a42dbf97b65572fc6392ac3ee86fa89a420d40..81ee949b946d557ca014c2c796ca20d8ffea04e9 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -1649,7 +1649,6 @@ static int chv_pinctrl_probe(struct platform_device *pdev)
        struct intel_community_context *cctx;
        struct intel_community *community;
        struct device *dev = &pdev->dev;
-       struct acpi_device *adev = ACPI_COMPANION(dev);
        struct intel_pinctrl *pctrl;
        acpi_status status;
        unsigned int i;
@@ -1717,7 +1716,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       status = acpi_install_address_space_handler(adev->handle,
+       status = acpi_install_address_space_handler(ACPI_HANDLE(dev),
                                        community->acpi_space_id,
                                        chv_pinctrl_mmio_access_handler,
                                        NULL, pctrl);
@@ -1734,7 +1733,7 @@ static int chv_pinctrl_remove(struct platform_device *pdev)
        struct intel_pinctrl *pctrl = platform_get_drvdata(pdev);
        const struct intel_community *community = &pctrl->communities[0];
 
-       acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev),
+       acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev),
                                          community->acpi_space_id,
                                          chv_pinctrl_mmio_access_handler);