Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

lirc_serial: make checkpatch happy

There are a few checkpatch complains here. As we're about to
promote this driver out of staging, address them.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

+18 -19
+18 -19
drivers/staging/media/lirc/lirc_serial.c
··· 352 352 dev_err(&serial_ir.pdev->dev, "Trapped in interrupt"); 353 353 break; 354 354 } 355 - if ((status & hardware[type].signal_pin_change) 356 - && sense != -1) { 355 + if ((status & hardware[type].signal_pin_change) && 356 + sense != -1) { 357 357 /* get current time */ 358 358 kt = ktime_get(); 359 359 ··· 377 377 delkt = ktime_sub(kt, serial_ir.lastkt); 378 378 if (ktime_compare(delkt, ktime_set(15, 0)) > 0) { 379 379 data = IR_MAX_DURATION; /* really long time */ 380 - if (!(dcd^sense)) { 380 + if (!(dcd ^ sense)) { 381 381 /* sanity check */ 382 382 dev_err(&serial_ir.pdev->dev, 383 383 "dcd unexpected: %d %d %lldns %lldns\n", ··· 389 389 */ 390 390 sense = sense ? 0 : 1; 391 391 } 392 - } else 392 + } else { 393 393 data = ktime_to_ns(delkt); 394 + } 394 395 frbwrite(data, !(dcd ^ sense)); 395 396 serial_ir.lastkt = kt; 396 397 last_dcd = dcd; ··· 400 399 } while (!(sinp(UART_IIR) & UART_IIR_NO_INT)); /* still pending ? */ 401 400 return IRQ_HANDLED; 402 401 } 403 - 404 402 405 403 static int hardware_init_port(void) 406 404 { ··· 432 432 433 433 /* First of all, disable all interrupts */ 434 434 soutp(UART_IER, sinp(UART_IER) & 435 - (~(UART_IER_MSI|UART_IER_RLSI|UART_IER_THRI|UART_IER_RDI))); 435 + (~(UART_IER_MSI | UART_IER_RLSI | UART_IER_THRI | UART_IER_RDI))); 436 436 437 437 /* Clear registers. */ 438 438 sinp(UART_LSR); ··· 487 487 } 488 488 489 489 /* Reserve io region. */ 490 - if (((iommap) 491 - && (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift, 492 - KBUILD_MODNAME) == NULL)) 493 - || ((!iommap) 494 - && (devm_request_region(&dev->dev, io, 8, 495 - KBUILD_MODNAME) == NULL))) { 490 + if ((iommap && 491 + (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift, 492 + KBUILD_MODNAME) == NULL)) || 493 + (!iommap && (devm_request_region(&dev->dev, io, 8, 494 + KBUILD_MODNAME) == NULL))) { 496 495 dev_err(&dev->dev, "port %04x already in use\n", io); 497 496 dev_warn(&dev->dev, "use 'setserial /dev/ttySX uart none'\n"); 498 497 dev_warn(&dev->dev, ··· 548 549 /* Set DLAB 0. */ 549 550 soutp(UART_LCR, sinp(UART_LCR) & (~UART_LCR_DLAB)); 550 551 551 - soutp(UART_IER, sinp(UART_IER)|UART_IER_MSI); 552 + soutp(UART_IER, sinp(UART_IER) | UART_IER_MSI); 552 553 553 554 spin_unlock_irqrestore(&hardware[type].lock, flags); 554 555 ··· 566 567 567 568 /* First of all, disable all interrupts */ 568 569 soutp(UART_IER, sinp(UART_IER) & 569 - (~(UART_IER_MSI|UART_IER_RLSI|UART_IER_THRI|UART_IER_RDI))); 570 + (~(UART_IER_MSI | UART_IER_RLSI | UART_IER_THRI | UART_IER_RDI))); 570 571 spin_unlock_irqrestore(&hardware[type].lock, flags); 571 572 } 572 573 ··· 586 587 587 588 edge = ktime_get(); 588 589 for (i = 0; i < count; i++) { 589 - if (i%2) 590 + if (i % 2) 590 591 hardware[type].send_space(); 591 592 else 592 593 hardware[type].send_pulse(txbuf[i], edge); ··· 597 598 spin_unlock_irqrestore(&hardware[type].lock, flags); 598 599 usleep_range(delta - 25, delta + 25); 599 600 spin_lock_irqsave(&hardware[type].lock, flags); 600 - } 601 - else if (delta > 0) 601 + } else if (delta > 0) { 602 602 udelay(delta); 603 + } 603 604 } 604 605 off(); 605 606 spin_unlock_irqrestore(&hardware[type].lock, flags); ··· 629 630 630 631 /* Disable all interrupts */ 631 632 soutp(UART_IER, sinp(UART_IER) & 632 - (~(UART_IER_MSI|UART_IER_RLSI|UART_IER_THRI|UART_IER_RDI))); 633 + (~(UART_IER_MSI | UART_IER_RLSI | UART_IER_THRI | UART_IER_RDI))); 633 634 634 635 /* Clear registers. */ 635 636 sinp(UART_LSR); ··· 652 653 spin_lock_irqsave(&hardware[type].lock, flags); 653 654 /* Enable Interrupt */ 654 655 serial_ir.lastkt = ktime_get(); 655 - soutp(UART_IER, sinp(UART_IER)|UART_IER_MSI); 656 + soutp(UART_IER, sinp(UART_IER) | UART_IER_MSI); 656 657 off(); 657 658 658 659 spin_unlock_irqrestore(&hardware[type].lock, flags);