Merge tag 'mailbox-fixes-v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox

torvalds · torvalds · commit b7087cb35a00 · 2024-05-31T16:21:00.000-07:00
Pull mailbox fix from Jassi Brar:

 - zynqmp-ipi: fix linker error on some configurations

* tag 'mailbox-fixes-v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox:
  mailbox: zynqmp-ipi: drop irq_to_desc() call
diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
@@ -850,7 +850,6 @@ static int xlnx_mbox_init_sgi(struct platform_device *pdev,
 		return ret;
 	}
 
-	irq_to_desc(pdata->virq_sgi);
 	irq_set_status_flags(pdata->virq_sgi, IRQ_PER_CPU);
 
 	/* Setup function for the CPU hot-plug cases */

Original file line number	Diff line number	Diff line change
`@@ -850,7 +850,6 @@ static int xlnx_mbox_init_sgi(struct platform_device *pdev,`
`850`	`850`	`return ret;`
`851`	`851`	`}`
`852`	`852`
`853`		`- irq_to_desc(pdata->virq_sgi);`
`854`	`853`	`irq_set_status_flags(pdata->virq_sgi, IRQ_PER_CPU);`
`855`	`854`
`856`	`855`	`/* Setup function for the CPU hot-plug cases */`