Unverified Commit bf08f323 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynqmp-soc-for-6.6' of https://github.com/Xilinx/linux-xlnx into soc/drivers 

arm64: ZynqMP SoC changes for 6.6

- Cleanup remove callback in event driver
- Explicitly include correct DT header in power driver
- Fix logic around irq = 0 in power driver

* tag 'zynqmp-soc-for-6.6' of https://github.com/Xilinx/linux-xlnx:
  soc: xilinx: Do not check for 0 return after calling platform_get_irq()
  soc: xilinx: Explicitly include correct DT includes
  driver: soc: xilinx: Convert to platform remove callback returning void

Link: https://lore.kernel.org/r/399efa45-df0a-4ec7-e25c-774bb8bf6fb4@monstr.eu


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eb865fd2 746db5d0

drivers/soc/xilinx/xlnx_event_manager.c

+2 −4
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static int xlnx_event_manager_probe(struct platform_device *pdev) 
	return ret;

}



static int xlnx_event_manager_remove(struct platform_device *pdev)

static void xlnx_event_manager_remove(struct platform_device *pdev)

{

	int i;

	struct registered_event_data *eve_data;
@@ -691,13 +691,11 @@ static int xlnx_event_manager_remove(struct platform_device *pdev) 
	xlnx_event_cleanup_sgi(pdev);



	event_manager_availability = -EACCES;



	return ret;

}



static struct platform_driver xlnx_event_manager_driver = {

	.probe = xlnx_event_manager_probe,

	.remove = xlnx_event_manager_remove,

	.remove_new = xlnx_event_manager_remove,

	.driver = {

		.name = "xlnx_event_manager",

	},

drivers/soc/xilinx/zynqmp_power.c

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/mailbox_client.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>

#include <linux/suspend.h>
@@ -242,8 +243,8 @@ static int zynqmp_pm_probe(struct platform_device *pdev) 
		}

	} else if (of_property_present(pdev->dev.of_node, "interrupts")) {

		irq = platform_get_irq(pdev, 0);

		if (irq <= 0)

			return -ENXIO;

		if (irq < 0)

			return irq;



		ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

						zynqmp_pm_isr,