[PATCH] Staging: media: lirc: cleaned up packet dump in 2 files.
lirc_imon.c and lirc_sasem.c contain an incoming_packet method that
is using deprecated printk's. Removed blocks replacing with single
dev_info with a %*ph format instead.
Signed-off-by: Amber Thrall amber.rose.thr...@gmail.com
---
drivers/staging/media/lirc/lirc_imon.c | 10 ++
drivers/staging/media/lirc/lirc_sasem.c | 10 ++
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_imon.c
b/drivers/staging/media/lirc/lirc_imon.c
index 7aca44f..232edd5 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -606,7 +606,6 @@ static void imon_incoming_packet(struct imon_context
*context,
struct device *dev = context-driver-dev;
int octet, bit;
unsigned char mask;
- int i;
/*
* just bail out if no listening IR client
@@ -620,13 +619,8 @@ static void imon_incoming_packet(struct imon_context
*context,
return;
}
- if (debug) {
- dev_info(dev, raw packet: );
- for (i = 0; i len; ++i)
- printk(%02x , buf[i]);
- printk(\n);
- }
-
+ if (debug)
+ dev_info(dev, raw packet: %*ph\n, len, buf);
/*
* Translate received data to pulse and space lengths.
* Received data is active low, i.e. pulses are 0 and
diff --git a/drivers/staging/media/lirc/lirc_sasem.c
b/drivers/staging/media/lirc/lirc_sasem.c
index c20ef56..2f0463e 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -573,7 +573,6 @@ static void incoming_packet(struct sasem_context *context,
unsigned char *buf = urb-transfer_buffer;
long ms;
struct timeval tv;
- int i;
if (len != 8) {
dev_warn(context-dev-dev,
@@ -582,13 +581,8 @@ static void incoming_packet(struct sasem_context *context,
return;
}
- if (debug) {
- printk(KERN_INFO Incoming data: );
- for (i = 0; i 8; ++i)
- printk(KERN_CONT %02x , buf[i]);
- printk(KERN_CONT \n);
- }
-
+ if (debug)
+ dev_info(context-dev-dev, Incoming data: %*ph\n, len, buf);
/*
* Lirc could deal with the repeat code, but we really need to block it
* if it arrives too late. Otherwise we could repeat the wrong code.
--
2.1.2
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Fixed all coding style issues for drivers/staging/media/lirc/
Fixed various coding sytles.
Signed-off-by: Amber Thrall amber.rose.thr...@gmail.com
---
drivers/staging/media/lirc/lirc_bt829.c | 2 +-
drivers/staging/media/lirc/lirc_imon.c | 4 +-
drivers/staging/media/lirc/lirc_sasem.c | 6 +--
drivers/staging/media/lirc/lirc_serial.c | 29 ++
drivers/staging/media/lirc/lirc_sir.c| 3 +-
drivers/staging/media/lirc/lirc_zilog.c | 69 +++-
6 files changed, 52 insertions(+), 61 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_bt829.c
b/drivers/staging/media/lirc/lirc_bt829.c
index 4c806ba..c70ca68 100644
--- a/drivers/staging/media/lirc/lirc_bt829.c
+++ b/drivers/staging/media/lirc/lirc_bt829.c
@@ -59,7 +59,7 @@ static bool debug;
#define dprintk(fmt, args...) \
do { \
if (debug) \
- printk(KERN_DEBUG DRIVER_NAME : fmt, ## args); \
+ dev_dbg(DRIVER_NAME, : fmt, ##args); \
} while (0)
static int atir_minor;
diff --git a/drivers/staging/media/lirc/lirc_imon.c
b/drivers/staging/media/lirc/lirc_imon.c
index 7aca44f..bce0408 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -623,8 +623,8 @@ static void imon_incoming_packet(struct imon_context
*context,
if (debug) {
dev_info(dev, raw packet: );
for (i = 0; i len; ++i)
- printk(%02x , buf[i]);
- printk(\n);
+ dev_info(dev, %02x , buf[i]);
+ dev_info(dev, \n);
}
/*
diff --git a/drivers/staging/media/lirc/lirc_sasem.c
b/drivers/staging/media/lirc/lirc_sasem.c
index c20ef56..e88e246 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -583,10 +583,10 @@ static void incoming_packet(struct sasem_context *context,
}
if (debug) {
- printk(KERN_INFO Incoming data: );
+ pr_info(Incoming data: );
for (i = 0; i 8; ++i)
- printk(KERN_CONT %02x , buf[i]);
- printk(KERN_CONT \n);
+ pr_cont(%02x, buf[i]);
+ pr_cont(\n);
}
/*
diff --git a/drivers/staging/media/lirc/lirc_serial.c
b/drivers/staging/media/lirc/lirc_serial.c
index 181b92b..b07671b 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -116,8 +116,7 @@ static bool txsense;/* 0 = active high, 1 = active
low */
#define dprintk(fmt, args...) \
do {\
if (debug) \
- printk(KERN_DEBUG LIRC_DRIVER_NAME : \
- fmt, ## args); \
+ dev_dbg(LIRC_DRIVER_NAME, : fmt, ##args); \
} while (0)
/* forward declarations */
@@ -356,9 +355,8 @@ static int init_timing_params(unsigned int new_duty_cycle,
/* Derive pulse and space from the period */
pulse_width = period * duty_cycle / 100;
space_width = period - pulse_width;
- dprintk(in init_timing_params, freq=%d, duty_cycle=%d,
- clk/jiffy=%ld, pulse=%ld, space=%ld,
- conv_us_to_clocks=%ld\n,
+ dprintk(in init_timing_params, freq=%d, duty_cycle=%d, clk/jiffy=%ld,
+ pulse=%ld, space=%ld, conv_us_to_clocks=%ld\n,
freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
pulse_width, space_width, conv_us_to_clocks);
return 0;
@@ -1075,7 +1073,7 @@ static int __init lirc_serial_init(void)
result = platform_driver_register(lirc_serial_driver);
if (result) {
- printk(lirc register returned %d\n, result);
+ dprintk(lirc register returned %d\n, result);
goto exit_buffer_free;
}
@@ -1166,22 +1164,20 @@ module_init(lirc_serial_init_module);
module_exit(lirc_serial_exit_module);
MODULE_DESCRIPTION(Infra-red receiver driver for serial ports.);
-MODULE_AUTHOR(Ralph Metzler, Trent Piepho, Ben Pfaff,
- Christoph Bartelmus, Andrei Tanas);
+MODULE_AUTHOR(Ralph Metzler, Trent Piepho, Ben Pfaff, Christoph Bartelmus,
Andrei Tanas);
MODULE_LICENSE(GPL);
module_param(type, int, S_IRUGO);
-MODULE_PARM_DESC(type, Hardware type (0 = home-brew, 1 = IRdeo,
- 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug,
- 5 = NSLU2 RX:CTS2/TX:GreenLED));
+MODULE_PARM_DESC(type, Hardware type (0 = home-brew, 1 = IRdeo,
+ 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug,
+ 5 = NSLU2 RX:CTS2/TX:GreenLED));
module_param(io, int, S_IRUGO);
MODULE_PARM_DESC(io, I/O address
[PATCH] Fixed all coding style issues for drivers/staging/media/lirc/
Fixed various coding style issues, including strings over 80 characters long
and many
deprecated printk's have been replaced with proper methods.
Signed-off-by: Amber Thrall amber.rose.thr...@gmail.com
---
drivers/staging/media/lirc/lirc_bt829.c | 2 +-
drivers/staging/media/lirc/lirc_imon.c | 4 +-
drivers/staging/media/lirc/lirc_sasem.c | 6 +--
drivers/staging/media/lirc/lirc_serial.c | 29 ++
drivers/staging/media/lirc/lirc_sir.c| 3 +-
drivers/staging/media/lirc/lirc_zilog.c | 69 +++-
6 files changed, 52 insertions(+), 61 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_bt829.c
b/drivers/staging/media/lirc/lirc_bt829.c
index 4c806ba..c70ca68 100644
--- a/drivers/staging/media/lirc/lirc_bt829.c
+++ b/drivers/staging/media/lirc/lirc_bt829.c
@@ -59,7 +59,7 @@ static bool debug;
#define dprintk(fmt, args...) \
do { \
if (debug) \
- printk(KERN_DEBUG DRIVER_NAME : fmt, ## args); \
+ dev_dbg(DRIVER_NAME, : fmt, ##args); \
} while (0)
static int atir_minor;
diff --git a/drivers/staging/media/lirc/lirc_imon.c
b/drivers/staging/media/lirc/lirc_imon.c
index 7aca44f..bce0408 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -623,8 +623,8 @@ static void imon_incoming_packet(struct imon_context
*context,
if (debug) {
dev_info(dev, raw packet: );
for (i = 0; i len; ++i)
- printk(%02x , buf[i]);
- printk(\n);
+ dev_info(dev, %02x , buf[i]);
+ dev_info(dev, \n);
}
/*
diff --git a/drivers/staging/media/lirc/lirc_sasem.c
b/drivers/staging/media/lirc/lirc_sasem.c
index c20ef56..e88e246 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -583,10 +583,10 @@ static void incoming_packet(struct sasem_context *context,
}
if (debug) {
- printk(KERN_INFO Incoming data: );
+ pr_info(Incoming data: );
for (i = 0; i 8; ++i)
- printk(KERN_CONT %02x , buf[i]);
- printk(KERN_CONT \n);
+ pr_cont(%02x, buf[i]);
+ pr_cont(\n);
}
/*
diff --git a/drivers/staging/media/lirc/lirc_serial.c
b/drivers/staging/media/lirc/lirc_serial.c
index 181b92b..b07671b 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -116,8 +116,7 @@ static bool txsense;/* 0 = active high, 1 = active
low */
#define dprintk(fmt, args...) \
do {\
if (debug) \
- printk(KERN_DEBUG LIRC_DRIVER_NAME : \
- fmt, ## args); \
+ dev_dbg(LIRC_DRIVER_NAME, : fmt, ##args); \
} while (0)
/* forward declarations */
@@ -356,9 +355,8 @@ static int init_timing_params(unsigned int new_duty_cycle,
/* Derive pulse and space from the period */
pulse_width = period * duty_cycle / 100;
space_width = period - pulse_width;
- dprintk(in init_timing_params, freq=%d, duty_cycle=%d,
- clk/jiffy=%ld, pulse=%ld, space=%ld,
- conv_us_to_clocks=%ld\n,
+ dprintk(in init_timing_params, freq=%d, duty_cycle=%d, clk/jiffy=%ld,
+ pulse=%ld, space=%ld, conv_us_to_clocks=%ld\n,
freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
pulse_width, space_width, conv_us_to_clocks);
return 0;
@@ -1075,7 +1073,7 @@ static int __init lirc_serial_init(void)
result = platform_driver_register(lirc_serial_driver);
if (result) {
- printk(lirc register returned %d\n, result);
+ dprintk(lirc register returned %d\n, result);
goto exit_buffer_free;
}
@@ -1166,22 +1164,20 @@ module_init(lirc_serial_init_module);
module_exit(lirc_serial_exit_module);
MODULE_DESCRIPTION(Infra-red receiver driver for serial ports.);
-MODULE_AUTHOR(Ralph Metzler, Trent Piepho, Ben Pfaff,
- Christoph Bartelmus, Andrei Tanas);
+MODULE_AUTHOR(Ralph Metzler, Trent Piepho, Ben Pfaff, Christoph Bartelmus,
Andrei Tanas);
MODULE_LICENSE(GPL);
module_param(type, int, S_IRUGO);
-MODULE_PARM_DESC(type, Hardware type (0 = home-brew, 1 = IRdeo,
- 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug,
- 5 = NSLU2 RX:CTS2/TX:GreenLED));
+MODULE_PARM_DESC(type, Hardware type (0 = home-brew, 1 = IRdeo,
+ 2 = IRdeo Remote, 3 = AnimaX, 4
[PATCH] Media: USB: usbtv: Fixed all coding style issues in usbtv source files.
Fixed various coding styles, ignoring coding style error on line 5 for all
files containing a link that is longer than 80 characters long.
Signed-off-by: Amber Thrall amber.rose.thr...@gmail.com
---
drivers/media/usb/usbtv/usbtv-audio.c | 1 +
drivers/media/usb/usbtv/usbtv-core.c | 1 +
drivers/media/usb/usbtv/usbtv-video.c | 3 +++
3 files changed, 5 insertions(+)
diff --git a/drivers/media/usb/usbtv/usbtv-audio.c
b/drivers/media/usb/usbtv/usbtv-audio.c
index 2d8795f..78c12d2 100644
--- a/drivers/media/usb/usbtv/usbtv-audio.c
+++ b/drivers/media/usb/usbtv/usbtv-audio.c
@@ -311,6 +311,7 @@ static int snd_usbtv_card_trigger(struct snd_pcm_substream
*substream, int cmd)
static snd_pcm_uframes_t snd_usbtv_pointer(struct snd_pcm_substream *substream)
{
struct usbtv *chip = snd_pcm_substream_chip(substream);
+
return chip-snd_buffer_pos;
}
diff --git a/drivers/media/usb/usbtv/usbtv-core.c
b/drivers/media/usb/usbtv/usbtv-core.c
index bf25ecf..29428be 100644
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -108,6 +108,7 @@ usbtv_video_fail:
static void usbtv_disconnect(struct usb_interface *intf)
{
struct usbtv *usbtv = usb_get_intfdata(intf);
+
usb_set_intfdata(intf, NULL);
if (!usbtv)
diff --git a/drivers/media/usb/usbtv/usbtv-video.c
b/drivers/media/usb/usbtv/usbtv-video.c
index 3d6ed1f..9d3525f 100644
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -263,6 +263,7 @@ static void usbtv_chunk_to_vbuf(u32 *frame, __be32 *src,
int chunk_no, int odd)
int part_index = (line * 2 + !odd) * 3 + (part_no % 3);
u32 *dst = frame[part_index * USBTV_CHUNK/2];
+
memcpy(dst, src, USBTV_CHUNK/2 * sizeof(*src));
src += USBTV_CHUNK/2;
}
@@ -407,6 +408,7 @@ static void usbtv_stop(struct usbtv *usbtv)
/* Cancel running transfers. */
for (i = 0; i USBTV_ISOC_TRANSFERS; i++) {
struct urb *ip = usbtv-isoc_urbs[i];
+
if (ip == NULL)
continue;
usb_kill_urb(ip);
@@ -560,6 +562,7 @@ static int usbtv_g_input(struct file *file, void *priv,
unsigned int *i)
static int usbtv_s_input(struct file *file, void *priv, unsigned int i)
{
struct usbtv *usbtv = video_drvdata(file);
+
return usbtv_select_input(usbtv, i);
}
--
2.1.0
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
