Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330888
b: refs/heads/master
c: f5c9903
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Aug 15, 2012
1 parent ebe30be commit fae02b9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 00d98c1bd6fe93de6db6a99ed25b4b7d96a402ec
refs/heads/master: f5c99037428b95da2ccc16daae6764b519ae0a90
6 changes: 4 additions & 2 deletions trunk/drivers/media/platform/s5p-tv/hdmi_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* or (at your option) any later version
*/

#define pr_fmt(fmt) "s5p-tv (hdmi_drv): " fmt

#ifdef CONFIG_VIDEO_SAMSUNG_S5P_HDMI_DEBUG
#define DEBUG
#endif
Expand Down Expand Up @@ -161,12 +163,12 @@ static irqreturn_t hdmi_irq_handler(int irq, void *dev_data)
intc_flag = hdmi_read(hdev, HDMI_INTC_FLAG);
/* clearing flags for HPD plug/unplug */
if (intc_flag & HDMI_INTC_FLAG_HPD_UNPLUG) {
printk(KERN_INFO "unplugged\n");
pr_info("unplugged\n");
hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0,
HDMI_INTC_FLAG_HPD_UNPLUG);
}
if (intc_flag & HDMI_INTC_FLAG_HPD_PLUG) {
printk(KERN_INFO "plugged\n");
pr_info("plugged\n");
hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0,
HDMI_INTC_FLAG_HPD_PLUG);
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/media/platform/s5p-tv/mixer_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,18 +461,18 @@ static struct platform_driver mxr_driver __refdata = {
static int __init mxr_init(void)
{
int i, ret;
static const char banner[] __initconst = KERN_INFO
static const char banner[] __initconst =
"Samsung TV Mixer driver, "
"(c) 2010-2011 Samsung Electronics Co., Ltd.\n";
printk(banner);
pr_info("%s\n", banner);

/* Loading auxiliary modules */
for (i = 0; i < ARRAY_SIZE(mxr_output_conf); ++i)
request_module(mxr_output_conf[i].module_name);

ret = platform_driver_register(&mxr_driver);
if (ret != 0) {
printk(KERN_ERR "registration of MIXER driver failed\n");
pr_err("s5p-tv: registration of MIXER driver failed\n");
return -ENXIO;
}

Expand Down
4 changes: 3 additions & 1 deletion trunk/drivers/media/platform/s5p-tv/mixer_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* or (at your option) any later version
*/

#define pr_fmt(fmt) "s5p-tv (mixer): " fmt

#include "mixer.h"

#include <media/v4l2-ioctl.h>
Expand Down Expand Up @@ -1053,7 +1055,7 @@ void mxr_base_layer_release(struct mxr_layer *layer)

static void mxr_vfd_release(struct video_device *vdev)
{
printk(KERN_INFO "video device release\n");
pr_info("video device release\n");
}

struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
Expand Down

0 comments on commit fae02b9

Please sign in to comment.