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

Commit 651c7a5f authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: some minor cleanups 



Mostly using appropriate data types and constants (e.g. int -> bool).

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b0ddb0f3

drivers/media/video/saa7134/saa7134-input.c

+19 −30
Original line number Diff line number Diff line
@@ -407,17 +407,16 @@ static int __saa7134_ir_start(void *priv) 
	struct saa7134_dev *dev = priv;

	struct saa7134_card_ir *ir;



	if (!dev)

	if (!dev || !dev->remote)

		return -EINVAL;



	ir  = dev->remote;

	if (!ir)

		return -EINVAL;



	if (ir->running)

		return 0;



	ir->running = true;

	ir->active = false;



	if (ir->polling) {

		setup_timer(&ir->timer, saa7134_input_timer,

			    (unsigned long)dev);
@@ -425,10 +424,8 @@ static int __saa7134_ir_start(void *priv) 
		add_timer(&ir->timer);

	} else if (ir->raw_decode) {

		/* set timer_end for code completion */

		init_timer(&ir->timer_end);

		ir->timer_end.function = ir_raw_decode_timer_end;

		ir->timer_end.data = (unsigned long)dev;

		ir->active = false;

		setup_timer(&ir->timer_end, ir_raw_decode_timer_end,

			    (unsigned long)dev);

	}



	return 0;
@@ -439,22 +436,19 @@ static void __saa7134_ir_stop(void *priv) 
	struct saa7134_dev *dev = priv;

	struct saa7134_card_ir *ir;



	if (!dev)

	if (!dev || !dev->remote)

		return;



	ir  = dev->remote;

	if (!ir)

		return;



	if (!ir->running)

		return;

	if (dev->remote->polling)

		del_timer_sync(&dev->remote->timer);

	else if (ir->raw_decode) {



	if (ir->polling)

		del_timer_sync(&ir->timer);

	else if (ir->raw_decode)

		del_timer_sync(&ir->timer_end);

		ir->active = false;

	}



	ir->active = false;

	ir->running = false;



	return;
@@ -499,8 +493,8 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
	u32 mask_keycode = 0;

	u32 mask_keydown = 0;

	u32 mask_keyup   = 0;

	int polling      = 0;

	int raw_decode   = 0;

	unsigned polling = 0;

	bool raw_decode  = false;

	int err;



	if (dev->has_remote != SAA7134_REMOTE_GPIO)
@@ -565,14 +559,14 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
		mask_keydown = 0x0040000;	/* Enable GPIO18 line on both edges */

		mask_keyup   = 0x0040000;

		mask_keycode = 0xffff;

		raw_decode   = 1;

		raw_decode   = true;

		break;

	case SAA7134_BOARD_AVERMEDIA_M733A:

		ir_codes     = RC_MAP_AVERMEDIA_M733A_RM_K6;

		mask_keydown = 0x0040000;

		mask_keyup   = 0x0040000;

		mask_keycode = 0xffff;

		raw_decode   = 1;

		raw_decode   = true;

		break;

	case SAA7134_BOARD_AVERMEDIA_777:

	case SAA7134_BOARD_AVERMEDIA_A16AR:
@@ -679,7 +673,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
		mask_keydown = 0x0040000;	/* Enable GPIO18 line on both edges */

		mask_keyup   = 0x0040000;

		mask_keycode = 0xffff;

		raw_decode   = 1;

		raw_decode   = true;

		break;

	case SAA7134_BOARD_ENCORE_ENLTV:

	case SAA7134_BOARD_ENCORE_ENLTV_FM:
@@ -693,7 +687,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
		mask_keydown = 0x0040000;	/* Enable GPIO18 line on both edges */

		mask_keyup   = 0x0040000;

		mask_keycode = 0xffff;

		raw_decode   = 1;

		raw_decode   = true;

		break;

	case SAA7134_BOARD_10MOONSTVMASTER3:

		ir_codes     = RC_MAP_ENCORE_ENLTV;
@@ -746,8 +740,6 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
	ir->dev = rc;

	dev->remote = ir;



	ir->running = false;



	/* init hardware-specific stuff */

	ir->mask_keycode = mask_keycode;

	ir->mask_keydown = mask_keydown;
@@ -809,14 +801,12 @@ void saa7134_input_fini(struct saa7134_dev *dev) 
void saa7134_probe_i2c_ir(struct saa7134_dev *dev)

{

	struct i2c_board_info info;



	struct i2c_msg msg_msi = {

		.addr = 0x50,

		.flags = I2C_M_RD,

		.len = 0,

		.buf = NULL,

	};



	int rc;



	if (disable_ir) {
@@ -926,7 +916,6 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev) 
	space = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2) & ir->mask_keydown;

	ir_raw_event_store_edge(dev->remote->dev, space ? IR_SPACE : IR_PULSE);





	/*

	 * Wait 15 ms from the start of the first IR event before processing

	 * the event. This time is enough for NEC protocol. May need adjustments

drivers/media/video/saa7134/saa7134.h

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ struct saa7134_card_ir { 


	char                    name[32];

	char                    phys[32];

	int                     users;

	unsigned                users;



	u32			polling;

        u32			last_gpio;