microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[media] staging: sir: fix checkpatch strict warnings 

Make the code more readable and clean up the includes list.

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-03-07 16:25:45 -03:00 коммит произвёл Mauro Carvalho Chehab
Родитель 402e7b63df
Коммит 43371f6b32
1 изменённых файлов: 8 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

45
drivers/staging/media/lirc/lirc_sir.c
Просмотреть файл

@ -8,52 +8,28 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
#include <linux/sched/signal.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/serial_reg.h>
#include <linux/ktime.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/wait.h>
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/poll.h>
#include <linux/io.h>
#include <asm/irq.h>
#include <linux/fcntl.h>
#include <linux/platform_device.h>
#include <linux/timer.h>
#include <media/rc-core.h>
/* SECTION: Definitions */
#define PULSE '['
/* 9bit * 1s/115200bit in milli seconds = 78.125ms*/
#define TIME_CONST (9000000ul/115200ul)
#define TIME_CONST (9000000ul / 115200ul)
/* timeout for sequences in jiffies (=5/100s), must be longer than TIME_CONST */
#define SIR_TIMEOUT (HZ*5/100)
#define SIR_TIMEOUT (HZ * 5 / 100)
/* onboard sir ports are typically com3 */
static int io = 0x3e8;
@ -103,7 +79,7 @@ static inline void soutp(int offset, int value)
#ifndef MAX_UDELAY_MS
#define MAX_UDELAY_US 5000
#else
#define MAX_UDELAY_US (MAX_UDELAY_MS*1000)
#define MAX_UDELAY_US (MAX_UDELAY_MS * 1000)
#endif
static void safe_udelay(unsigned long usecs)
@ -227,18 +203,13 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id)
int iir, lsr;
while ((iir = inb(io + UART_IIR) & UART_IIR_ID)) {
switch (iir&UART_IIR_ID) { /* FIXME toto treba preriedit */
switch (iir & UART_IIR_ID) { /* FIXME toto treba preriedit */
case UART_IIR_MSI:
(void) inb(io + UART_MSR);
(void)inb(io + UART_MSR);
break;
case UART_IIR_RLSI:
(void) inb(io + UART_LSR);
break;
case UART_IIR_THRI:
#if 0
if (lsr & UART_LSR_THRE) /* FIFO is empty */
outb(data, io + UART_TX)
#endif
(void)inb(io + UART_LSR);
break;
case UART_IIR_RDI:
/* avoid interference with timer */
@ -279,7 +250,7 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id)
* the other case is timeout
*/
add_read_queue(last_value,
delt-TIME_CONST);
delt - TIME_CONST);
last_value = data;
last = curr_time;
last = ktime_sub_us(last,
@ -348,7 +319,7 @@ static int init_hardware(void)
/* outb(UART_IER_RLSI|UART_IER_RDI|UART_IER_THRI, io + UART_IER); */
outb(UART_IER_RDI, io + UART_IER);
/* 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);
return 0;
}