mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 06:30:53 +07:00
V4L/DVB (8024): vivi: rename MODULE_NAME macro to VIVI_MODULE_NAME to avoid namespace conflicts
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
745271aefe
commit
584ce48de9
@ -39,7 +39,7 @@
|
|||||||
#include <linux/highmem.h>
|
#include <linux/highmem.h>
|
||||||
#include <linux/freezer.h>
|
#include <linux/freezer.h>
|
||||||
|
|
||||||
#define MODULE_NAME "vivi"
|
#define VIVI_MODULE_NAME "vivi"
|
||||||
|
|
||||||
/* Wake up at about 30 fps */
|
/* Wake up at about 30 fps */
|
||||||
#define WAKE_NUMERATOR 30
|
#define WAKE_NUMERATOR 30
|
||||||
@ -1022,11 +1022,11 @@ static int vivi_release(void)
|
|||||||
if (-1 != dev->vfd->minor) {
|
if (-1 != dev->vfd->minor) {
|
||||||
video_unregister_device(dev->vfd);
|
video_unregister_device(dev->vfd);
|
||||||
printk(KERN_INFO "%s: /dev/video%d unregistered.\n",
|
printk(KERN_INFO "%s: /dev/video%d unregistered.\n",
|
||||||
MODULE_NAME, dev->vfd->minor);
|
VIVI_MODULE_NAME, dev->vfd->minor);
|
||||||
} else {
|
} else {
|
||||||
video_device_release(dev->vfd);
|
video_device_release(dev->vfd);
|
||||||
printk(KERN_INFO "%s: /dev/video%d released.\n",
|
printk(KERN_INFO "%s: /dev/video%d released.\n",
|
||||||
MODULE_NAME, dev->vfd->minor);
|
VIVI_MODULE_NAME, dev->vfd->minor);
|
||||||
}
|
}
|
||||||
|
|
||||||
kfree(dev);
|
kfree(dev);
|
||||||
@ -1139,7 +1139,7 @@ static int __init vivi_init(void)
|
|||||||
|
|
||||||
dev->vfd = vfd;
|
dev->vfd = vfd;
|
||||||
printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n",
|
printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n",
|
||||||
MODULE_NAME, vfd->minor);
|
VIVI_MODULE_NAME, vfd->minor);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user