These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / serial / ifx6x60.c

diff --git a/kernel/drivers/tty/serial/ifx6x60.c b/kernel/drivers/tty/serial/ifx6x60.c
index 5903909..88246f7 100644 (file)
--- a/kernel/drivers/tty/serial/ifx6x60.c
+++ b/kernel/drivers/tty/serial/ifx6x60.c
@@ -1175,7 +1175,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
        ret = request_irq(gpio_to_irq(ifx_dev->gpio.reset_out),
                          ifx_spi_reset_interrupt,
                          IRQF_TRIGGER_RISING|IRQF_TRIGGER_FALLING, DRVNAME,
-               (void *)ifx_dev);
+                         ifx_dev);
        if (ret) {
                dev_err(&spi->dev, "Unable to get irq %x\n",
                        gpio_to_irq(ifx_dev->gpio.reset_out));
@@ -1185,9 +1185,8 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
        ret = ifx_spi_reset(ifx_dev);
 
        ret = request_irq(gpio_to_irq(ifx_dev->gpio.srdy),
-                         ifx_spi_srdy_interrupt,
-                         IRQF_TRIGGER_RISING, DRVNAME,
-                         (void *)ifx_dev);
+                         ifx_spi_srdy_interrupt, IRQF_TRIGGER_RISING, DRVNAME,
+                         ifx_dev);
        if (ret) {
                dev_err(&spi->dev, "Unable to get irq %x",
                        gpio_to_irq(ifx_dev->gpio.srdy));
@@ -1212,7 +1211,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
        return 0;
 
 error_ret7:
-       free_irq(gpio_to_irq(ifx_dev->gpio.reset_out), (void *)ifx_dev);
+       free_irq(gpio_to_irq(ifx_dev->gpio.reset_out), ifx_dev);
 error_ret6:
        gpio_free(ifx_dev->gpio.srdy);
 error_ret5:
@@ -1243,8 +1242,8 @@ static int ifx_spi_spi_remove(struct spi_device *spi)
        /* stop activity */
        tasklet_kill(&ifx_dev->io_work_tasklet);
        /* free irq */
-       free_irq(gpio_to_irq(ifx_dev->gpio.reset_out), (void *)ifx_dev);
-       free_irq(gpio_to_irq(ifx_dev->gpio.srdy), (void *)ifx_dev);
+       free_irq(gpio_to_irq(ifx_dev->gpio.reset_out), ifx_dev);
+       free_irq(gpio_to_irq(ifx_dev->gpio.srdy), ifx_dev);
 
        gpio_free(ifx_dev->gpio.srdy);
        gpio_free(ifx_dev->gpio.mrdy);
@@ -1363,7 +1362,7 @@ static struct spi_driver ifx_spi_driver = {
        .driver = {
                .name = DRVNAME,
                .pm = &ifx_spi_pm,
-               .owner = THIS_MODULE},
+       },
        .probe = ifx_spi_spi_probe,
        .shutdown = ifx_spi_spi_shutdown,
        .remove = ifx_spi_spi_remove,
@@ -1381,7 +1380,7 @@ static void __exit ifx_spi_exit(void)
        /* unregister */
        tty_unregister_driver(tty_drv);
        put_tty_driver(tty_drv);
-       spi_unregister_driver((void *)&ifx_spi_driver);
+       spi_unregister_driver(&ifx_spi_driver);
        unregister_reboot_notifier(&ifx_modem_reboot_notifier_block);
 }
 
@@ -1420,7 +1419,7 @@ static int __init ifx_spi_init(void)
                goto err_free_tty;
        }
 
-       result = spi_register_driver((void *)&ifx_spi_driver);
+       result = spi_register_driver(&ifx_spi_driver);
        if (result) {
                pr_err("%s: spi_register_driver failed(%d)",
                        DRVNAME, result);
@@ -1436,7 +1435,7 @@ static int __init ifx_spi_init(void)
 
        return 0;
 err_unreg_spi:
-       spi_unregister_driver((void *)&ifx_spi_driver);
+       spi_unregister_driver(&ifx_spi_driver);
 err_unreg_tty:
        tty_unregister_driver(tty_drv);
 err_free_tty: