summaryrefslogtreecommitdiff
path: root/drivers/media/rc/sir_ir.c
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-05-17 20:32:52 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-06 15:15:38 +0300
commitf23f54087096e51ffc6765b7ddddb5f9eb517fa9 (patch)
treec32c135fe70bd2094900fc5687a8e9c233c57190 /drivers/media/rc/sir_ir.c
parentb462e1b20dc39f4af05bcbf850e574c381b17038 (diff)
downloadlinux-f23f54087096e51ffc6765b7ddddb5f9eb517fa9.tar.xz
[media] sir_ir: remove init_port and drop_port functions
These functions are too short and removing them makes the code more readable. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc/sir_ir.c')
-rw-r--r--drivers/media/rc/sir_ir.c27
1 files changed, 5 insertions, 22 deletions
diff --git a/drivers/media/rc/sir_ir.c b/drivers/media/rc/sir_ir.c
index 1ee41adb2ab1..fdac5704c30e 100644
--- a/drivers/media/rc/sir_ir.c
+++ b/drivers/media/rc/sir_ir.c
@@ -58,11 +58,9 @@ static int init_chrdev(void);
static irqreturn_t sir_interrupt(int irq, void *dev_id);
static void send_space(unsigned long len);
static void send_pulse(unsigned long len);
-static int init_hardware(void);
+static void init_hardware(void);
static void drop_hardware(void);
/* Initialisation */
-static int init_port(void);
-static void drop_port(void);
static inline unsigned int sinp(int offset)
{
@@ -288,7 +286,7 @@ static void send_pulse(unsigned long len)
}
}
-static int init_hardware(void)
+static void init_hardware(void)
{
unsigned long flags;
@@ -310,7 +308,6 @@ static int init_hardware(void)
/* turn on UART */
outb(UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2, io + UART_MCR);
spin_unlock_irqrestore(&hardware_lock, flags);
- return 0;
}
static void drop_hardware(void)
@@ -327,7 +324,7 @@ static void drop_hardware(void)
/* SECTION: Initialisation */
-static int init_port(void)
+static int init_sir_ir(void)
{
int retval;
@@ -346,22 +343,8 @@ static int init_port(void)
}
pr_info("I/O port 0x%.4x, IRQ %d.\n", io, irq);
- return 0;
-}
-
-static void drop_port(void)
-{
- del_timer_sync(&timerlist);
-}
-
-static int init_sir_ir(void)
-{
- int retval;
-
- retval = init_port();
- if (retval < 0)
- return retval;
init_hardware();
+
return 0;
}
@@ -379,7 +362,7 @@ static int sir_ir_probe(struct platform_device *dev)
static int sir_ir_remove(struct platform_device *dev)
{
drop_hardware();
- drop_port();
+ del_timer_sync(&timerlist);
return 0;
}