Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b3a0d49 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6120): ivtvfb: rename some missed ivtv-fb references to ivtvfb 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0f45b8c5

drivers/media/video/ivtv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -41,4 +41,4 @@ config VIDEO_FB_IVTV 
	  homepage at <http://www.ivtvdriver.org>.



	  To compile this driver as a module, choose M here: the

	  module will be called ivtv-fb.
 
	  module will be called ivtvfb.

drivers/media/video/ivtv/ivtv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static void module_cleanup(void) 
	spin_unlock(&ivtv_cards_lock);

}



/* Note: These symbols are exported because they are used by the ivtv-fb

/* Note: These symbols are exported because they are used by the ivtvfb

   framebuffer module and an infrared module for the IR-blaster. */

EXPORT_SYMBOL(ivtv_set_irq_mask);

EXPORT_SYMBOL(ivtv_cards_active);

drivers/media/video/ivtv/ivtv-driver.h

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ struct ivtv { 
	u32 osd_chroma_key;             /* current chroma key */

	struct v4l2_rect osd_rect;      /* current OSD position and size */

	struct v4l2_rect main_rect;     /* current Main window position and size */

	struct osd_info *osd_info;      /* ivtv-fb private OSD info */

	struct osd_info *osd_info;      /* ivtvfb private OSD info */

};



/* Globals */

drivers/media/video/ivtv/ivtvfb.c

+7 −7
Original line number Diff line number Diff line
@@ -128,15 +128,15 @@ MODULE_LICENSE("GPL"); 
#define IVTV_FB_DEBUG(x, type, fmt, args...) \

	do { \

		if ((x) & ivtv_fb_debug) \

			printk(KERN_INFO "ivtv-fb%d " type ": " fmt, itv->num , ## args); \

			printk(KERN_INFO "ivtvfb%d " type ": " fmt, itv->num , ## args); \

	} while (0)

#define IVTV_FB_DEBUG_WARN(fmt, args...)  IVTV_FB_DEBUG(IVTV_FB_DBGFLG_WARN, "warning", fmt , ## args)

#define IVTV_FB_DEBUG_INFO(fmt, args...)  IVTV_FB_DEBUG(IVTV_FB_DBGFLG_INFO, "info", fmt , ## args)



/* Standard kernel messages */

#define IVTV_FB_ERR(fmt, args...)   printk(KERN_ERR  "ivtv-fb%d: " fmt, itv->num , ## args)

#define IVTV_FB_WARN(fmt, args...)  printk(KERN_WARNING  "ivtv-fb%d: " fmt, itv->num , ## args)

#define IVTV_FB_INFO(fmt, args...)  printk(KERN_INFO "ivtv-fb%d: " fmt, itv->num , ## args)

#define IVTV_FB_ERR(fmt, args...)   printk(KERN_ERR  "ivtvfb%d: " fmt, itv->num , ## args)

#define IVTV_FB_WARN(fmt, args...)  printk(KERN_WARNING  "ivtvfb%d: " fmt, itv->num , ## args)

#define IVTV_FB_INFO(fmt, args...)  printk(KERN_INFO "ivtvfb%d: " fmt, itv->num , ## args)



/* --------------------------------------------------------------------- */
@@ -1143,7 +1143,7 @@ static int __init ivtvfb_init(void) 
	int i, registered = 0;



	if (ivtv_fb_card_id < -1 || ivtv_fb_card_id >= IVTV_MAX_CARDS) {

		printk(KERN_ERR "ivtv-fb:  ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n",

		printk(KERN_ERR "ivtvfb:  ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n",

		     IVTV_MAX_CARDS - 1);

		return -EINVAL;

	}
@@ -1161,7 +1161,7 @@ static int __init ivtvfb_init(void) 
		}

	}

	if (!registered) {

		printk(KERN_ERR "ivtv-fb:  no cards found");

		printk(KERN_ERR "ivtvfb:  no cards found");

		return -ENODEV;

	}

	return 0;
@@ -1172,7 +1172,7 @@ static void ivtvfb_cleanup(void) 
	struct ivtv *itv;

	int i;



	printk(KERN_INFO "ivtv-fb:  Unloading framebuffer module\n");

	printk(KERN_INFO "ivtvfb:  Unloading framebuffer module\n");



	for (i = 0; i < ivtv_cards_active; i++) {

		itv = ivtv_cards[i];