| Message ID | 20240128-fix-clang-warnings-v1-1-1d946013a421@chromium.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: Fix warnings building with LLVM=1 | expand |
On Sun, Jan 28, 2024 at 02:12:20AM +0000, Ricardo Ribalda wrote: > Building with LLVM=1 throws the following warning: > drivers/media/pci/sta2x11/sta2x11_vip.c:1057:6: warning: 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 [-Wcast-function-type-strict] > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org> I wonder if the media tree cares about reverse Christmas tree order for variables? > --- > drivers/media/pci/sta2x11/sta2x11_vip.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c > index e4cf9d63e926..0a3827575753 100644 > --- a/drivers/media/pci/sta2x11/sta2x11_vip.c > +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c > @@ -757,7 +757,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. > @@ -767,9 +767,10 @@ 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) > { > unsigned int status; > + struct sta2x11_vip *vip = data; > > status = reg_read(vip, DVP_ITS); > > > -- > 2.43.0.429.g432eaa2c6b-goog >
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c index e4cf9d63e926..0a3827575753 100644 --- a/drivers/media/pci/sta2x11/sta2x11_vip.c +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c @@ -757,7 +757,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. @@ -767,9 +767,10 @@ 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) { unsigned int status; + struct sta2x11_vip *vip = data; status = reg_read(vip, DVP_ITS);
Building with LLVM=1 throws the following warning: drivers/media/pci/sta2x11/sta2x11_vip.c:1057:6: warning: 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 [-Wcast-function-type-strict] Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/pci/sta2x11/sta2x11_vip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)