public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[media] sir_ir: remove init_port and drop_port functions

Browse source 
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>
This commit is contained in:
Sean Young 2017-05-17 14:32:52 -03:00 • committed by Mauro Carvalho Chehab
parent b462e1b20d
commit f23f540870
1 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/media/rc/sir_ir.c
View file

@ -58,11 +58,9 @@ static int init_chrdev(void);
static irqreturn_t sir_interrupt(int irq, void *dev_id); static irqreturn_t sir_interrupt(int irq, void *dev_id);
static void send_space(unsigned long len); static void send_space(unsigned long len);
static void send_pulse(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); static void drop_hardware(void);
/* Initialisation */ /* Initialisation */
static int init_port(void);
static void drop_port(void);
static inline unsigned int sinp(int offset) 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; unsigned long flags;
@ -310,7 +308,6 @@ static int init_hardware(void)
/* turn on UART */ /* turn on UART */
outb(UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2, io + UART_MCR); outb(UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2, io + UART_MCR);
spin_unlock_irqrestore(&hardware_lock, flags); spin_unlock_irqrestore(&hardware_lock, flags);
return 0;
} }
static void drop_hardware(void) static void drop_hardware(void)
@ -327,7 +324,7 @@ static void drop_hardware(void)
/* SECTION: Initialisation */ /* SECTION: Initialisation */
static int init_port(void) static int init_sir_ir(void)
{ {
int retval; int retval;
@ -346,22 +343,8 @@ static int init_port(void)
} }
pr_info("I/O port 0x%.4x, IRQ %d.\n", io, irq); 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(); init_hardware();
return 0; return 0;
} }
@ -379,7 +362,7 @@ static int sir_ir_probe(struct platform_device *dev)
static int sir_ir_remove(struct platform_device *dev) static int sir_ir_remove(struct platform_device *dev)
{ {
drop_hardware(); drop_hardware();
drop_port(); del_timer_sync(&timerlist);
return 0; return 0;
} }