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

[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
...@@ -157,10 +157,9 @@ static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed) ...@@ -157,10 +157,9 @@ static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
if (mutex_lock_interruptible(&as102_dev->sem)) if (mutex_lock_interruptible(&as102_dev->sem))
return -ERESTARTSYS; return -ERESTARTSYS;
if (pid_filtering) { if (pid_filtering)
as10x_pid_filter(as102_dev, as10x_pid_filter(as102_dev, dvbdmxfeed->index,
dvbdmxfeed->index, dvbdmxfeed->pid, 1); dvbdmxfeed->pid, 1);
}
if (as102_dev->streaming++ == 0) if (as102_dev->streaming++ == 0)
ret = as102_start_stream(as102_dev); ret = as102_start_stream(as102_dev);
...@@ -183,10 +182,9 @@ static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed) ...@@ -183,10 +182,9 @@ static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
if (--as102_dev->streaming == 0) if (--as102_dev->streaming == 0)
as102_stop_stream(as102_dev); as102_stop_stream(as102_dev);
if (pid_filtering) { if (pid_filtering)
as10x_pid_filter(as102_dev, as10x_pid_filter(as102_dev, dvbdmxfeed->index,
dvbdmxfeed->index, dvbdmxfeed->pid, 0); dvbdmxfeed->pid, 0);
}
mutex_unlock(&as102_dev->sem); mutex_unlock(&as102_dev->sem);
LEAVE(); LEAVE();
......
...@@ -32,13 +32,13 @@ extern struct usb_driver as102_usb_driver; ...@@ -32,13 +32,13 @@ extern struct usb_driver as102_usb_driver;
#define dprintk(debug, args...) \ #define dprintk(debug, args...) \
do { if (debug) { \ do { if (debug) { \
printk(KERN_DEBUG "%s: ",__FUNCTION__); \ pr_debug("%s: ", __func__); \
printk(args); \ printk(args); \
} } while (0) } } while (0)
#ifdef TRACE #ifdef TRACE
#define ENTER() printk(">> enter %s\n", __FUNCTION__) #define ENTER() pr_debug(">> enter %s\n", __func__)
#define LEAVE() printk("<< leave %s\n", __FUNCTION__) #define LEAVE() pr_debug("<< leave %s\n", __func__)
#else #else
#define ENTER() #define ENTER()
#define LEAVE() #define LEAVE()
......
...@@ -232,7 +232,7 @@ int as10x_cmd_get_tune_status(as10x_handle_t *phandle, ...@@ -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 * @phandle: pointer to AS10x handle
* @ptps: pointer to TPS parameters structure * @ptps: pointer to TPS parameters structure
* *
......
...@@ -435,13 +435,14 @@ union as10x_raw_data { ...@@ -435,13 +435,14 @@ union as10x_raw_data {
/* request */ /* request */
struct { struct {
uint16_t proc_id; 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; } req;
/* response */ /* response */
struct { struct {
uint16_t proc_id; uint16_t proc_id;
uint8_t error; 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 */]; - 2 /* proc_id */ - 1 /* rc */];
} rsp; } rsp;
} __packed; } __packed;
......
...@@ -170,9 +170,9 @@ struct as10x_demod_stats { ...@@ -170,9 +170,9 @@ struct as10x_demod_stats {
} __packed; } __packed;
struct as10x_ts_filter { struct as10x_ts_filter {
uint16_t pid; /** valid PID value 0x00 : 0x2000 */ uint16_t pid; /* valid PID value 0x00 : 0x2000 */
uint8_t type; /** Red TS_PID_TYPE_<N> values */ uint8_t type; /* Red TS_PID_TYPE_<N> values */
uint8_t idx; /** index in filtering table */ uint8_t idx; /* index in filtering table */
} __packed; } __packed;
struct as10x_register_value { struct as10x_register_value {
...@@ -181,7 +181,7 @@ struct as10x_register_value { ...@@ -181,7 +181,7 @@ struct as10x_register_value {
uint8_t value8; /* 8 bit value */ uint8_t value8; /* 8 bit value */
uint16_t value16; /* 16 bit value */ uint16_t value16; /* 16 bit value */
uint32_t value32; /* 32 bit value */ uint32_t value32; /* 32 bit value */
}u; } u;
} __packed; } __packed;
struct as10x_register_addr { struct as10x_register_addr {
...@@ -191,5 +191,4 @@ struct as10x_register_addr { ...@@ -191,5 +191,4 @@ struct as10x_register_addr {
uint8_t mode; uint8_t mode;
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment