Commit 14e0e4bf authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] staging: as102: Whitespace and indentation cleanup 



Remove some unnecessary braces. Replace spaces with tabs where
expected. Replace gcc specific __FUNCTION__ with  C99 __func__.
No functional changes.

Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 88010289

drivers/staging/media/as102/as102_drv.c

+18 −20
Original line number Diff line number Diff line
@@ -157,10 +157,9 @@ static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed) 
	if (mutex_lock_interruptible(&as102_dev->sem))

		return -ERESTARTSYS;



	if (pid_filtering) {

		as10x_pid_filter(as102_dev,

				dvbdmxfeed->index, dvbdmxfeed->pid, 1);

	}

	if (pid_filtering)

		as10x_pid_filter(as102_dev, dvbdmxfeed->index,

				 dvbdmxfeed->pid, 1);



	if (as102_dev->streaming++ == 0)

		ret = as102_start_stream(as102_dev);
@@ -183,10 +182,9 @@ static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed) 
	if (--as102_dev->streaming == 0)

		as102_stop_stream(as102_dev);



	if (pid_filtering) {

		as10x_pid_filter(as102_dev,

				dvbdmxfeed->index, dvbdmxfeed->pid, 0);

	}

	if (pid_filtering)

		as10x_pid_filter(as102_dev, dvbdmxfeed->index,

				 dvbdmxfeed->pid, 0);



	mutex_unlock(&as102_dev->sem);

	LEAVE();

drivers/staging/media/as102/as102_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ extern struct usb_driver as102_usb_driver; 


#define dprintk(debug, args...) \

	do { if (debug) {	\

		printk(KERN_DEBUG "%s: ",__FUNCTION__);	\

		pr_debug("%s: ", __func__);	\

		printk(args);	\

	} } while (0)



#ifdef TRACE

#define ENTER()                 printk(">> enter %s\n", __FUNCTION__)

#define LEAVE()                 printk("<< leave %s\n", __FUNCTION__)

#define ENTER()	pr_debug(">> enter %s\n", __func__)

#define LEAVE()	pr_debug("<< leave %s\n", __func__)

#else

#define ENTER()

#define LEAVE()

drivers/staging/media/as102/as10x_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ int as10x_cmd_get_tune_status(as10x_handle_t *phandle, 
}



/**

 * send get TPS command to AS10x

 * as10x_cmd_get_tps - send get TPS command to AS10x

 * @phandle:   pointer to AS10x handle

 * @ptps:      pointer to TPS parameters structure

 *

drivers/staging/media/as102/as10x_cmd.h

+344 −343
Original line number Diff line number Diff line
@@ -435,13 +435,14 @@ union as10x_raw_data { 
	/* request */

	struct {

		uint16_t proc_id;

      uint8_t data[64 - sizeof(struct as10x_cmd_header_t) -2 /* proc_id */];

		uint8_t data[64 - sizeof(struct as10x_cmd_header_t)

			     - 2 /* proc_id */];

	} req;

	/* response */

	struct {

		uint16_t proc_id;

		uint8_t error;

      uint8_t data[64 - sizeof(struct as10x_cmd_header_t) /* header */

		uint8_t data[64 - sizeof(struct as10x_cmd_header_t)

			     - 2 /* proc_id */ - 1 /* rc */];

	} rsp;

} __packed;

drivers/staging/media/as102/as10x_types.h

+117 −118
Original line number Diff line number Diff line
@@ -170,9 +170,9 @@ struct as10x_demod_stats { 
} __packed;



struct as10x_ts_filter {

   uint16_t pid;  /** valid PID value 0x00 : 0x2000 */

   uint8_t  type; /** Red TS_PID_TYPE_<N> values */

   uint8_t  idx;  /** index in filtering table */

	uint16_t pid;  /* valid PID value 0x00 : 0x2000 */

	uint8_t  type; /* Red TS_PID_TYPE_<N> values */

	uint8_t  idx;  /* index in filtering table */

} __packed;



struct as10x_register_value {
@@ -191,5 +191,4 @@ struct as10x_register_addr { 
	uint8_t mode;

};





#endif

drivers/staging/media/as102/as10x_handle.h

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/media/as102/as102_usb_drv.c

+7 −7

File changed.

Contains only whitespace changes.