Commit 6246d4e1 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab

V4L/DVB (10761): cx18: Change log lines for internal subdevs and fix tveeprom reads

Give messages originating from internal subdevs a header using the subdev's
name.  Fixed an uninitialized variable problem with reading the EEPROM, noticed
from log output.  Got rid of the unused cx18_av_exit() function.
Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6da6bf5e
This diff is collapsed.
...@@ -343,7 +343,6 @@ int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value); ...@@ -343,7 +343,6 @@ int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value);
void cx18_av_std_setup(struct cx18 *cx); void cx18_av_std_setup(struct cx18 *cx);
int cx18_av_probe(struct cx18 *cx); int cx18_av_probe(struct cx18 *cx);
void cx18_av_exit(struct cx18 *cx, struct v4l2_subdev *sd);
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* cx18_av-firmware.c */ /* cx18_av-firmware.c */
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
int cx18_av_loadfw(struct cx18 *cx) int cx18_av_loadfw(struct cx18 *cx)
{ {
struct v4l2_subdev *sd = &cx->av_state.sd;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
u32 size; u32 size;
u32 v; u32 v;
...@@ -37,7 +38,7 @@ int cx18_av_loadfw(struct cx18 *cx) ...@@ -37,7 +38,7 @@ int cx18_av_loadfw(struct cx18 *cx)
int retries1 = 0; int retries1 = 0;
if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) { if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) {
CX18_ERR("unable to open firmware %s\n", FWFILE); CX18_ERR_DEV(sd, "unable to open firmware %s\n", FWFILE);
return -EINVAL; return -EINVAL;
} }
...@@ -88,7 +89,7 @@ int cx18_av_loadfw(struct cx18 *cx) ...@@ -88,7 +89,7 @@ int cx18_av_loadfw(struct cx18 *cx)
retries1++; retries1++;
} }
if (retries1 >= 5) { if (retries1 >= 5) {
CX18_ERR("unable to load firmware %s\n", FWFILE); CX18_ERR_DEV(sd, "unable to load firmware %s\n", FWFILE);
release_firmware(fw); release_firmware(fw);
return -EIO; return -EIO;
} }
...@@ -143,6 +144,6 @@ int cx18_av_loadfw(struct cx18 *cx) ...@@ -143,6 +144,6 @@ int cx18_av_loadfw(struct cx18 *cx)
release_firmware(fw); release_firmware(fw);
CX18_INFO("loaded %s firmware (%d bytes)\n", FWFILE, size); CX18_INFO_DEV(sd, "loaded %s firmware (%d bytes)\n", FWFILE, size);
return 0; return 0;
} }
...@@ -272,6 +272,7 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv) ...@@ -272,6 +272,7 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
struct i2c_client c; struct i2c_client c;
u8 eedata[256]; u8 eedata[256];
memset(&c, 0, sizeof(c));
strncpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); strncpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
c.name[sizeof(c.name)-1] = '\0'; c.name[sizeof(c.name)-1] = '\0';
c.adapter = &cx->i2c_adap[0]; c.adapter = &cx->i2c_adap[0];
......
...@@ -179,6 +179,55 @@ ...@@ -179,6 +179,55 @@
#define CX18_WARN(fmt, args...) v4l2_warn(&cx->v4l2_dev, fmt , ## args) #define CX18_WARN(fmt, args...) v4l2_warn(&cx->v4l2_dev, fmt , ## args)
#define CX18_INFO(fmt, args...) v4l2_info(&cx->v4l2_dev, fmt , ## args) #define CX18_INFO(fmt, args...) v4l2_info(&cx->v4l2_dev, fmt , ## args)
/* Messages for internal subdevs to use */
#define CX18_DEBUG_DEV(x, dev, type, fmt, args...) \
do { \
if ((x) & cx18_debug) \
v4l2_info(dev, " " type ": " fmt , ## args); \
} while (0)
#define CX18_DEBUG_WARN_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_WARN, dev, "warning", fmt , ## args)
#define CX18_DEBUG_INFO_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_INFO, dev, "info", fmt , ## args)
#define CX18_DEBUG_API_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_API, dev, "api", fmt , ## args)
#define CX18_DEBUG_DMA_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_DMA, dev, "dma", fmt , ## args)
#define CX18_DEBUG_IOCTL_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_IOCTL, dev, "ioctl", fmt , ## args)
#define CX18_DEBUG_FILE_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_FILE, dev, "file", fmt , ## args)
#define CX18_DEBUG_I2C_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_I2C, dev, "i2c", fmt , ## args)
#define CX18_DEBUG_IRQ_DEV(dev, fmt, args...) \
CX18_DEBUG_DEV(CX18_DBGFLG_IRQ, dev, "irq", fmt , ## args)
#define CX18_DEBUG_HIGH_VOL_DEV(x, dev, type, fmt, args...) \
do { \
if (((x) & cx18_debug) && (cx18_debug & CX18_DBGFLG_HIGHVOL)) \
v4l2_info(dev, " " type ": " fmt , ## args); \
} while (0)
#define CX18_DEBUG_HI_WARN_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_WARN, dev, "warning", fmt , ## args)
#define CX18_DEBUG_HI_INFO_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_INFO, dev, "info", fmt , ## args)
#define CX18_DEBUG_HI_API_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_API, dev, "api", fmt , ## args)
#define CX18_DEBUG_HI_DMA_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_DMA, dev, "dma", fmt , ## args)
#define CX18_DEBUG_HI_IOCTL_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_IOCTL, dev, "ioctl", fmt , ## args)
#define CX18_DEBUG_HI_FILE_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_FILE, dev, "file", fmt , ## args)
#define CX18_DEBUG_HI_I2C_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_I2C, dev, "i2c", fmt , ## args)
#define CX18_DEBUG_HI_IRQ_DEV(dev, fmt, args...) \
CX18_DEBUG_HIGH_VOL_DEV(CX18_DBGFLG_IRQ, dev, "irq", fmt , ## args)
#define CX18_ERR_DEV(dev, fmt, args...) v4l2_err(dev, fmt , ## args)
#define CX18_WARN_DEV(dev, fmt, args...) v4l2_warn(dev, fmt , ## args)
#define CX18_INFO_DEV(dev, fmt, args...) v4l2_info(dev, fmt , ## args)
/* Values for CX18_API_DEC_PLAYBACK_SPEED mpeg_frame_type_mask parameter: */ /* Values for CX18_API_DEC_PLAYBACK_SPEED mpeg_frame_type_mask parameter: */
#define MPEG_FRAME_TYPE_IFRAME 1 #define MPEG_FRAME_TYPE_IFRAME 1
#define MPEG_FRAME_TYPE_IFRAME_PFRAME 3 #define MPEG_FRAME_TYPE_IFRAME_PFRAME 3
......
...@@ -110,8 +110,8 @@ static int gpiomux_log_status(struct v4l2_subdev *sd) ...@@ -110,8 +110,8 @@ static int gpiomux_log_status(struct v4l2_subdev *sd)
struct cx18 *cx = v4l2_get_subdevdata(sd); struct cx18 *cx = v4l2_get_subdevdata(sd);
mutex_lock(&cx->gpio_lock); mutex_lock(&cx->gpio_lock);
CX18_INFO("GPIO: direction 0x%08x, value 0x%08x\n", CX18_INFO_DEV(sd, "GPIO: direction 0x%08x, value 0x%08x\n",
cx->gpio_dir, cx->gpio_val); cx->gpio_dir, cx->gpio_val);
mutex_unlock(&cx->gpio_lock); mutex_unlock(&cx->gpio_lock);
return 0; return 0;
} }
...@@ -205,8 +205,8 @@ static int resetctrl_log_status(struct v4l2_subdev *sd) ...@@ -205,8 +205,8 @@ static int resetctrl_log_status(struct v4l2_subdev *sd)
struct cx18 *cx = v4l2_get_subdevdata(sd); struct cx18 *cx = v4l2_get_subdevdata(sd);
mutex_lock(&cx->gpio_lock); mutex_lock(&cx->gpio_lock);
CX18_INFO("GPIO: direction 0x%08x, value 0x%08x\n", CX18_INFO_DEV(sd, "GPIO: direction 0x%08x, value 0x%08x\n",
cx->gpio_dir, cx->gpio_val); cx->gpio_dir, cx->gpio_val);
mutex_unlock(&cx->gpio_lock); mutex_unlock(&cx->gpio_lock);
return 0; return 0;
} }
...@@ -297,12 +297,12 @@ int cx18_gpio_register(struct cx18 *cx, u32 hw) ...@@ -297,12 +297,12 @@ int cx18_gpio_register(struct cx18 *cx, u32 hw)
case CX18_HW_GPIO_MUX: case CX18_HW_GPIO_MUX:
sd = &cx->sd_gpiomux; sd = &cx->sd_gpiomux;
ops = &gpiomux_ops; ops = &gpiomux_ops;
str = "gpio mux"; str = "gpio-mux";
break; break;
case CX18_HW_GPIO_RESET_CTRL: case CX18_HW_GPIO_RESET_CTRL:
sd = &cx->sd_resetctrl; sd = &cx->sd_resetctrl;
ops = &resetctrl_ops; ops = &resetctrl_ops;
str = "gpio reset ctrl"; str = "gpio-reset-ctrl";
break; break;
default: default:
return -EINVAL; return -EINVAL;
......
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