ieee1394: dv1394: move deprecation message from module init to file open
On many Linux installations, the dv1394 driver will be auto-loaded whenever an AV/C device (e.g. camcorder or audio device) is plugged in. An irritating message would then appear in the kernel log. Defer this message to until a dv1394 character device file is actually used by a program. Also include the program name in the message and update the message slightly. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
parent
b7479febde
commit
86431532ec
|
@ -1823,6 +1823,10 @@ static int dv1394_open(struct inode *inode, struct file *file)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported "
|
||||||
|
"and will not be available in the new firewire driver stack. "
|
||||||
|
"Try libraw1394 based programs instead.\n", current->comm);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2567,10 +2571,6 @@ static int __init dv1394_init_module(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
printk(KERN_WARNING
|
|
||||||
"NOTE: The dv1394 driver is unsupported and may be removed in a "
|
|
||||||
"future Linux release. Use raw1394 instead.\n");
|
|
||||||
|
|
||||||
cdev_init(&dv1394_cdev, &dv1394_fops);
|
cdev_init(&dv1394_cdev, &dv1394_fops);
|
||||||
dv1394_cdev.owner = THIS_MODULE;
|
dv1394_cdev.owner = THIS_MODULE;
|
||||||
ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
|
ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
|
||||||
|
|
Loading…
Reference in New Issue