[media] staging: lirc_sir: remove dead code

[karo-tx-linux.git] / drivers / staging / media / lirc / lirc_sir.c

diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index a45799874a21cf7ded13745c508ec99410b09f25..f781c532b3c42e7c4a8b3635c66b967cc8beb649 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -33,6 +33,8 @@
  *   parts cut'n'pasted from sa1100_ir.c (C) 2000 Russell King
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
@@ -495,7 +497,7 @@ static int init_chrdev(void)
        driver.dev = &lirc_sir_dev->dev;
        driver.minor = lirc_register_driver(&driver);
        if (driver.minor < 0) {
-               printk(KERN_ERR LIRC_DRIVER_NAME ": init_chrdev() failed.\n");
+               pr_err("init_chrdev() failed.\n");
                return -EIO;
        }
        return 0;
@@ -604,7 +606,7 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id)
        }
 
        if (status & UTSR0_TFS)
-               printk(KERN_ERR "transmit fifo not full, shouldn't happen\n");
+               pr_err("transmit fifo not full, shouldn't happen\n");
 
        /* We must clear certain bits. */
        status &= (UTSR0_RID | UTSR0_RBB | UTSR0_REB);
@@ -785,12 +787,6 @@ static int init_hardware(void)
        spin_lock_irqsave(&hardware_lock, flags);
        /* reset UART */
 #ifdef LIRC_ON_SA1100
-#ifdef CONFIG_SA1100_BITSY
-       if (machine_is_bitsy()) {
-               printk(KERN_INFO "Power on IR module\n");
-               set_bitsy_egpio(EGPIO_BITSY_IR_ON);
-       }
-#endif
 #ifdef CONFIG_SA1100_COLLIE
        sa1100_irda_set_power_collie(3);        /* power on */
 #endif
@@ -885,8 +881,7 @@ static int init_hardware(void)
        udelay(1500);
 
        /* read previous control byte */
-       printk(KERN_INFO LIRC_DRIVER_NAME
-              ": 0x%02x\n", sinp(UART_RX));
+       pr_info("0x%02x\n", sinp(UART_RX));
 
        /* Set DLAB 1. */
        soutp(UART_LCR, sinp(UART_LCR) | UART_LCR_DLAB);
@@ -941,10 +936,6 @@ static void drop_hardware(void)
        Ser2UTCR3 = sr.utcr3;
 
        Ser2HSCR0 = sr.hscr0;
-#ifdef CONFIG_SA1100_BITSY
-       if (machine_is_bitsy())
-               clr_bitsy_egpio(EGPIO_BITSY_IR_ON);
-#endif
 #ifdef CONFIG_SA1100_COLLIE
        sa1100_irda_set_power_collie(0);        /* power off */
 #endif
@@ -964,8 +955,7 @@ static int init_port(void)
        /* get I/O port access and IRQ line */
 #ifndef LIRC_ON_SA1100
        if (request_region(io, 8, LIRC_DRIVER_NAME) == NULL) {
-               printk(KERN_ERR LIRC_DRIVER_NAME
-                      ": i/o port 0x%.4x already in use.\n", io);
+               pr_err("i/o port 0x%.4x already in use.\n", io);
                return -EBUSY;
        }
 #endif
@@ -975,15 +965,11 @@ static int init_port(void)
 #               ifndef LIRC_ON_SA1100
                release_region(io, 8);
 #               endif
-               printk(KERN_ERR LIRC_DRIVER_NAME
-                       ": IRQ %d already in use.\n",
-                       irq);
+               pr_err("IRQ %d already in use.\n", irq);
                return retval;
        }
 #ifndef LIRC_ON_SA1100
-       printk(KERN_INFO LIRC_DRIVER_NAME
-               ": I/O port 0x%.4x, IRQ %d.\n",
-               io, irq);
+       pr_info("I/O port 0x%.4x, IRQ %d.\n", io, irq);
 #endif
 
        init_timer(&timerlist);
@@ -1213,8 +1199,7 @@ static int init_lirc_sir(void)
        if (retval < 0)
                return retval;
        init_hardware();
-       printk(KERN_INFO LIRC_DRIVER_NAME
-               ": Installed.\n");
+       pr_info("Installed.\n");
        return 0;
 }
 
@@ -1243,23 +1228,20 @@ static int __init lirc_sir_init(void)
 
        retval = platform_driver_register(&lirc_sir_driver);
        if (retval) {
-               printk(KERN_ERR LIRC_DRIVER_NAME ": Platform driver register "
-                      "failed!\n");
+               pr_err("Platform driver register failed!\n");
                return -ENODEV;
        }
 
        lirc_sir_dev = platform_device_alloc("lirc_dev", 0);
        if (!lirc_sir_dev) {
-               printk(KERN_ERR LIRC_DRIVER_NAME ": Platform device alloc "
-                      "failed!\n");
+               pr_err("Platform device alloc failed!\n");
                retval = -ENOMEM;
                goto pdev_alloc_fail;
        }
 
        retval = platform_device_add(lirc_sir_dev);
        if (retval) {
-               printk(KERN_ERR LIRC_DRIVER_NAME ": Platform device add "
-                      "failed!\n");
+               pr_err("Platform device add failed!\n");
                retval = -ENODEV;
                goto pdev_add_fail;
        }
@@ -1292,7 +1274,7 @@ static void __exit lirc_sir_exit(void)
        drop_port();
        platform_device_unregister(lirc_sir_dev);
        platform_driver_unregister(&lirc_sir_driver);
-       printk(KERN_INFO LIRC_DRIVER_NAME ": Uninstalled.\n");
+       pr_info("Uninstalled.\n");
 }
 
 module_init(lirc_sir_init);