On Mon February 4 2013 03:40:32 Huang Shijie wrote:
> 于 2013年01月31日 05:25, Hans Verkuil 写道:
> > From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> >
> > Set the correct parent for v4l2_device_register. Also remove an unnecessary
> > forward reference and fix two weird looking log messages.
> >
> > Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> > ---
> > drivers/media/usb/tlg2300/pd-main.c | 9 ++++-----
> > 1 file changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/media/usb/tlg2300/pd-main.c b/drivers/media/usb/tlg2300/pd-main.c
> > index 7b1f6eb..c4eb57a 100644
> > --- a/drivers/media/usb/tlg2300/pd-main.c
> > +++ b/drivers/media/usb/tlg2300/pd-main.c
> > @@ -55,7 +55,6 @@ MODULE_PARM_DESC(debug_mode, "0 = disable, 1 = enable, 2 = verbose");
> >
> > #define TLG2300_FIRMWARE "tlg2300_firmware.bin"
> > static const char *firmware_name = TLG2300_FIRMWARE;
> > -static struct usb_driver poseidon_driver;
> > static LIST_HEAD(pd_device_list);
> >
> > /*
> > @@ -316,7 +315,7 @@ static int poseidon_suspend(struct usb_interface *intf, pm_message_t msg)
> > if (get_pm_count(pd) <= 0 && !in_hibernation(pd)) {
> > pd->msg.event = PM_EVENT_AUTO_SUSPEND;
> > pd->pm_resume = NULL; /* a good guard */
> > - printk(KERN_DEBUG "\n\t+ TLG2300 auto suspend +\n\n");
> > + printk(KERN_DEBUG "TLG2300 auto suspend\n");
> > }
> > return 0;
> > }
> > @@ -331,7 +330,7 @@ static int poseidon_resume(struct usb_interface *intf)
> >
> > if (!pd)
> > return 0;
> > - printk(KERN_DEBUG "\n\t ++ TLG2300 resume ++\n\n");
> > + printk(KERN_DEBUG "TLG2300 resume\n");
> >
> > if (!is_working(pd)) {
> > if (PM_EVENT_AUTO_SUSPEND == pd->msg.event)
> > @@ -439,7 +438,7 @@ static int poseidon_probe(struct usb_interface *interface,
> > /* register v4l2 device */
> > snprintf(pd->v4l2_dev.name, sizeof(pd->v4l2_dev.name), "%s %s",
> > dev->driver->name, dev_name(dev));
> I think this line could be removed in this patch too. The
> v4l2_device_register() will assign the v4l2_dev->name if it's empty.
I agree, I'll remove this in the next version.
Regards,
Hans
>
> thanks
> Huang Shijie
> > - ret = v4l2_device_register(NULL, &pd->v4l2_dev);
> > + ret = v4l2_device_register(&interface->dev, &pd->v4l2_dev);
> >
> > /* register devices in directory /dev */
> > ret = pd_video_init(pd);
> > @@ -530,7 +529,7 @@ module_init(poseidon_init);
> > module_exit(poseidon_exit);
> >
> > MODULE_AUTHOR("Telegent Systems");
> > -MODULE_DESCRIPTION("For tlg2300-based USB device ");
> > +MODULE_DESCRIPTION("For tlg2300-based USB device");
> > MODULE_LICENSE("GPL");
> > MODULE_VERSION("0.0.2");
> > MODULE_FIRMWARE(TLG2300_FIRMWARE);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
