diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtvfb.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtvfb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index ff721c088479..c8ca7cbbe38b 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
@@ -128,15 +128,15 @@ MODULE_LICENSE("GPL"); | |||
128 | #define IVTV_FB_DEBUG(x, type, fmt, args...) \ | 128 | #define IVTV_FB_DEBUG(x, type, fmt, args...) \ |
129 | do { \ | 129 | do { \ |
130 | if ((x) & ivtv_fb_debug) \ | 130 | if ((x) & ivtv_fb_debug) \ |
131 | printk(KERN_INFO "ivtv-fb%d " type ": " fmt, itv->num , ## args); \ | 131 | printk(KERN_INFO "ivtvfb%d " type ": " fmt, itv->num , ## args); \ |
132 | } while (0) | 132 | } while (0) |
133 | #define IVTV_FB_DEBUG_WARN(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_WARN, "warning", fmt , ## args) | 133 | #define IVTV_FB_DEBUG_WARN(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_WARN, "warning", fmt , ## args) |
134 | #define IVTV_FB_DEBUG_INFO(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_INFO, "info", fmt , ## args) | 134 | #define IVTV_FB_DEBUG_INFO(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_INFO, "info", fmt , ## args) |
135 | 135 | ||
136 | /* Standard kernel messages */ | 136 | /* Standard kernel messages */ |
137 | #define IVTV_FB_ERR(fmt, args...) printk(KERN_ERR "ivtv-fb%d: " fmt, itv->num , ## args) | 137 | #define IVTV_FB_ERR(fmt, args...) printk(KERN_ERR "ivtvfb%d: " fmt, itv->num , ## args) |
138 | #define IVTV_FB_WARN(fmt, args...) printk(KERN_WARNING "ivtv-fb%d: " fmt, itv->num , ## args) | 138 | #define IVTV_FB_WARN(fmt, args...) printk(KERN_WARNING "ivtvfb%d: " fmt, itv->num , ## args) |
139 | #define IVTV_FB_INFO(fmt, args...) printk(KERN_INFO "ivtv-fb%d: " fmt, itv->num , ## args) | 139 | #define IVTV_FB_INFO(fmt, args...) printk(KERN_INFO "ivtvfb%d: " fmt, itv->num , ## args) |
140 | 140 | ||
141 | /* --------------------------------------------------------------------- */ | 141 | /* --------------------------------------------------------------------- */ |
142 | 142 | ||
@@ -1143,7 +1143,7 @@ static int __init ivtvfb_init(void) | |||
1143 | int i, registered = 0; | 1143 | int i, registered = 0; |
1144 | 1144 | ||
1145 | if (ivtv_fb_card_id < -1 || ivtv_fb_card_id >= IVTV_MAX_CARDS) { | 1145 | if (ivtv_fb_card_id < -1 || ivtv_fb_card_id >= IVTV_MAX_CARDS) { |
1146 | printk(KERN_ERR "ivtv-fb: ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n", | 1146 | printk(KERN_ERR "ivtvfb: ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n", |
1147 | IVTV_MAX_CARDS - 1); | 1147 | IVTV_MAX_CARDS - 1); |
1148 | return -EINVAL; | 1148 | return -EINVAL; |
1149 | } | 1149 | } |
@@ -1161,7 +1161,7 @@ static int __init ivtvfb_init(void) | |||
1161 | } | 1161 | } |
1162 | } | 1162 | } |
1163 | if (!registered) { | 1163 | if (!registered) { |
1164 | printk(KERN_ERR "ivtv-fb: no cards found"); | 1164 | printk(KERN_ERR "ivtvfb: no cards found"); |
1165 | return -ENODEV; | 1165 | return -ENODEV; |
1166 | } | 1166 | } |
1167 | return 0; | 1167 | return 0; |
@@ -1172,7 +1172,7 @@ static void ivtvfb_cleanup(void) | |||
1172 | struct ivtv *itv; | 1172 | struct ivtv *itv; |
1173 | int i; | 1173 | int i; |
1174 | 1174 | ||
1175 | printk(KERN_INFO "ivtv-fb: Unloading framebuffer module\n"); | 1175 | printk(KERN_INFO "ivtvfb: Unloading framebuffer module\n"); |
1176 | 1176 | ||
1177 | for (i = 0; i < ivtv_cards_active; i++) { | 1177 | for (i = 0; i < ivtv_cards_active; i++) { |
1178 | itv = ivtv_cards[i]; | 1178 | itv = ivtv_cards[i]; |