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>
---
Changes since v1:
- Update subject and commit message

 drivers/pinctrl/intel/pinctrl-cherryview.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index 7ffe4dafeebb..2bb574cf01d9 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -1650,7 +1650,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;
@@ -1718,7 +1717,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);
@@ -1735,7 +1734,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);
 
-- 
2.17.1

On Tue, Aug 22, 2023 at 12:53:40PM +0530, Raag Jadav wrote:
> 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>

On Tue, Aug 22, 2023 at 02:20:34PM +0300, Mika Westerberg wrote:
> On Tue, Aug 22, 2023 at 12:53:40PM +0530, Raag Jadav wrote:
> > 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>

Pushed to my review and testing queue, thanks!

-- 
With Best Regards,
Andy Shevchenko