Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f6ad41 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 0a847634

drivers/staging/media/lirc/lirc_serial.c

+18 −19
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ static irqreturn_t serial_ir_irq_handler(int i, void *blah) 
			dev_err(&serial_ir.pdev->dev, "Trapped in interrupt");

			break;

		}

		if ((status & hardware[type].signal_pin_change)

		    && sense != -1) {

		if ((status & hardware[type].signal_pin_change) &&

		    sense != -1) {

			/* get current time */

			kt = ktime_get();
@@ -389,8 +389,9 @@ static irqreturn_t serial_ir_irq_handler(int i, void *blah) 
					 */

					sense = sense ? 0 : 1;

				}

			} else

			} else {

				data = ktime_to_ns(delkt);

			}

			frbwrite(data, !(dcd ^ sense));

			serial_ir.lastkt = kt;

			last_dcd = dcd;
@@ -400,7 +401,6 @@ static irqreturn_t serial_ir_irq_handler(int i, void *blah) 
	return IRQ_HANDLED;

}





static int hardware_init_port(void)

{

	u8 scratch, scratch2, scratch3;
@@ -487,11 +487,10 @@ static int serial_ir_probe(struct platform_device *dev) 
	}



	/* Reserve io region. */

	if (((iommap)

	     && (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift,

					 KBUILD_MODNAME) == NULL))

	   || ((!iommap)

	       && (devm_request_region(&dev->dev, io, 8,

	if ((iommap &&

	     (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift,

				      KBUILD_MODNAME) == NULL)) ||

	     (!iommap && (devm_request_region(&dev->dev, io, 8,

			  KBUILD_MODNAME) == NULL))) {

		dev_err(&dev->dev, "port %04x already in use\n", io);

		dev_warn(&dev->dev, "use 'setserial /dev/ttySX uart none'\n");
@@ -598,10 +597,10 @@ static int serial_ir_tx(struct rc_dev *dev, unsigned int *txbuf, 
			spin_unlock_irqrestore(&hardware[type].lock, flags);

			usleep_range(delta - 25, delta + 25);

			spin_lock_irqsave(&hardware[type].lock, flags);

		}

		else if (delta > 0)

		} else if (delta > 0) {

			udelay(delta);

		}

	}

	off();

	spin_unlock_irqrestore(&hardware[type].lock, flags);

	return count;