Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / mailbox / zynqmp-ipi-mailbox.c

diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
index 7fa533e..25c65af 100644 (file)
--- a/drivers/mailbox/zynqmp-ipi-mailbox.c
+++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
@@ -81,7 +81,6 @@ struct zynqmp_ipi_mchan {
  * @remote_id:            remote IPI agent ID
  * @mbox:                 mailbox Controller
  * @mchans:               array for channels, tx channel and rx channel.
- * @irq:                  IPI agent interrupt ID
  */
 struct zynqmp_ipi_mbox {
        struct zynqmp_ipi_pdata *pdata;
@@ -688,19 +687,17 @@ free_mbox_dev:
        return ret;
 }
 
-static int zynqmp_ipi_remove(struct platform_device *pdev)
+static void zynqmp_ipi_remove(struct platform_device *pdev)
 {
        struct zynqmp_ipi_pdata *pdata;
 
        pdata = platform_get_drvdata(pdev);
        zynqmp_ipi_free_mboxes(pdata);
-
-       return 0;
 }
 
 static struct platform_driver zynqmp_ipi_driver = {
        .probe = zynqmp_ipi_probe,
-       .remove = zynqmp_ipi_remove,
+       .remove_new = zynqmp_ipi_remove,
        .driver = {
                   .name = "zynqmp-ipi",
                   .of_match_table = of_match_ptr(zynqmp_ipi_of_match),