Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a35b778 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

media: sta2x11: fix irq handler cast 



[ Upstream commit 3de49ae81c3a0f83a554ecbce4c08e019f30168e ]

clang-16 warns about casting incompatible function pointers:

drivers/media/pci/sta2x11/sta2x11_vip.c:1057:6: error: cast from 'irqreturn_t (*)(int, struct sta2x11_vip *)' (aka 'enum irqreturn (*)(int, struct sta2x11_vip *)') to 'irq_handler_t' (aka 'enum irqreturn (*)(int, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]

Change the prototype of the irq handler to the regular version with a
local variable to adjust the argument type.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil: update argument documentation]
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2c1f8404

drivers/media/pci/sta2x11/sta2x11_vip.c

+4 −5
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static const struct video_device video_dev_template = { 
/**

 * vip_irq - interrupt routine

 * @irq: Number of interrupt ( not used, correct number is assumed )

 * @vip: local data structure containing all information

 * @data: local data structure containing all information

 *

 * check for both frame interrupts set ( top and bottom ).

 * check FIFO overflow, but limit number of log messages after open.
@@ -770,8 +770,9 @@ static const struct video_device video_dev_template = { 
 *

 * IRQ_HANDLED, interrupt done.

 */

static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip)

static irqreturn_t vip_irq(int irq, void *data)

{

	struct sta2x11_vip *vip = data;

	unsigned int status;



	status = reg_read(vip, DVP_ITS);
@@ -1053,9 +1054,7 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev, 


	spin_lock_init(&vip->slock);



	ret = request_irq(pdev->irq,

			  (irq_handler_t) vip_irq,

			  IRQF_SHARED, KBUILD_MODNAME, vip);

	ret = request_irq(pdev->irq, vip_irq, IRQF_SHARED, KBUILD_MODNAME, vip);

	if (ret) {

		dev_err(&pdev->dev, "request_irq failed\n");

		ret = -ENODEV;