diff options
Diffstat (limited to 'drivers/media/pci/ivtv')
| -rw-r--r-- | drivers/media/pci/ivtv/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-main.c | 31 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 18 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-mixer.h | 5 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 21 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 5 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa.h | 5 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-driver.c | 12 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-driver.h | 37 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-ioctl.c | 49 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-mailbox.c | 4 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtvfb.c | 23 |
12 files changed, 101 insertions, 122 deletions
diff --git a/drivers/media/pci/ivtv/Kconfig b/drivers/media/pci/ivtv/Kconfig index 6e5867c57305..c72cbbd2d40c 100644 --- a/drivers/media/pci/ivtv/Kconfig +++ b/drivers/media/pci/ivtv/Kconfig @@ -28,6 +28,19 @@ config VIDEO_IVTV To compile this driver as a module, choose M here: the module will be called ivtv. +config VIDEO_IVTV_DEPRECATED_IOCTLS + bool "enable the DVB ioctls abuse on ivtv driver" + depends on VIDEO_IVTV + default n + ---help--- + Enable the usage of the a DVB set of ioctls that were abused by + IVTV driver for a while. + + Those ioctls were not needed for a long time, as IVTV implements + the proper V4L2 ioctls since kernel 3.3. + + If unsure, say N. + config VIDEO_IVTV_ALSA tristate "Conexant cx23415/cx23416 ALSA interface for PCM audio capture" depends on VIDEO_IVTV && SND diff --git a/drivers/media/pci/ivtv/ivtv-alsa-main.c b/drivers/media/pci/ivtv/ivtv-alsa-main.c index 374f45f81ab3..029f52733f70 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-main.c +++ b/drivers/media/pci/ivtv/ivtv-alsa-main.c @@ -15,38 +15,25 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA */ -#include <linux/init.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/device.h> -#include <linux/spinlock.h> - -#include <media/v4l2-device.h> - -#include <sound/core.h> -#include <sound/initval.h> - #include "ivtv-driver.h" #include "ivtv-version.h" #include "ivtv-alsa.h" #include "ivtv-alsa-mixer.h" #include "ivtv-alsa-pcm.h" +#include <sound/core.h> +#include <sound/initval.h> + int ivtv_alsa_debug; static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; -#define IVTV_DEBUG_ALSA_INFO(fmt, arg...) \ +#define IVTV_DEBUG_ALSA_INFO(__fmt, __arg...) \ do { \ if (ivtv_alsa_debug & 2) \ - pr_info("%s: " fmt, "ivtv-alsa", ## arg); \ + printk(KERN_INFO pr_fmt("%s: alsa:" __fmt), \ + __func__, ##__arg); \ } while (0) module_param_named(debug, ivtv_alsa_debug, int, 0644); @@ -235,8 +222,7 @@ static int ivtv_alsa_load(struct ivtv *itv) s = &itv->streams[IVTV_ENC_STREAM_TYPE_PCM]; if (s->vdev.v4l2_dev == NULL) { - IVTV_DEBUG_ALSA_INFO("%s: PCM stream for card is disabled - skipping\n", - __func__); + IVTV_DEBUG_ALSA_INFO("PCM stream for card is disabled - skipping\n"); return 0; } @@ -250,8 +236,7 @@ static int ivtv_alsa_load(struct ivtv *itv) IVTV_ALSA_ERR("%s: failed to create struct snd_ivtv_card\n", __func__); } else { - IVTV_DEBUG_ALSA_INFO("%s: created ivtv ALSA interface instance \n", - __func__); + IVTV_DEBUG_ALSA_INFO("created ivtv ALSA interface instance\n"); } return 0; } diff --git a/drivers/media/pci/ivtv/ivtv-alsa-mixer.c b/drivers/media/pci/ivtv/ivtv-alsa-mixer.c index 79b24bde4a39..ba372a23eb5c 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-mixer.c +++ b/drivers/media/pci/ivtv/ivtv-alsa-mixer.c @@ -13,28 +13,18 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA */ -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/device.h> -#include <linux/spinlock.h> -#include <linux/videodev2.h> +#include "ivtv-alsa.h" +#include "ivtv-alsa-mixer.h" +#include "ivtv-driver.h" -#include <media/v4l2-device.h> +#include <linux/videodev2.h> #include <sound/core.h> #include <sound/control.h> #include <sound/tlv.h> -#include "ivtv-alsa.h" -#include "ivtv-driver.h" - /* * Note the cx25840-core volume scale is funny, due to the alignment of the * scale with another chip's range: diff --git a/drivers/media/pci/ivtv/ivtv-alsa-mixer.h b/drivers/media/pci/ivtv/ivtv-alsa-mixer.h index cdde36704d53..382bc36bc529 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-mixer.h +++ b/drivers/media/pci/ivtv/ivtv-alsa-mixer.h @@ -13,11 +13,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA */ int __init snd_ivtv_mixer_create(struct snd_ivtv_card *itvsc); diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c index a26f9800eca3..807ead20d212 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c +++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c @@ -16,22 +16,8 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA */ -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/vmalloc.h> - -#include <media/v4l2-device.h> - -#include <sound/core.h> -#include <sound/pcm.h> - #include "ivtv-driver.h" #include "ivtv-queue.h" #include "ivtv-streams.h" @@ -39,6 +25,12 @@ #include "ivtv-alsa.h" #include "ivtv-alsa-pcm.h" +#include <linux/vmalloc.h> + +#include <sound/core.h> +#include <sound/pcm.h> + + static unsigned int pcm_debug; module_param(pcm_debug, int, 0644); MODULE_PARM_DESC(pcm_debug, "enable debug messages for pcm"); @@ -174,6 +166,7 @@ static int snd_ivtv_pcm_capture_open(struct snd_pcm_substream *substream) /* See if the stream is available */ if (ivtv_claim_stream(&item, item.type)) { /* No, it's already in use */ + v4l2_fh_exit(&item.fh); snd_ivtv_unlock(itvsc); return -EBUSY; } diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.h b/drivers/media/pci/ivtv/ivtv-alsa-pcm.h index 186814e0b2d4..147586a886fc 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.h +++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.h @@ -13,11 +13,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA */ int snd_ivtv_pcm_create(struct snd_ivtv_card *itvsc); diff --git a/drivers/media/pci/ivtv/ivtv-alsa.h b/drivers/media/pci/ivtv/ivtv-alsa.h index 4a0d8f2c254d..eae646223367 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa.h +++ b/drivers/media/pci/ivtv/ivtv-alsa.h @@ -13,11 +13,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA */ struct snd_card; diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c index 0a3b80a4bd69..ab2ae53618e8 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c @@ -1452,7 +1452,7 @@ static void ivtv_remove(struct pci_dev *pdev) for (i = 0; i < IVTV_VBI_FRAMES; i++) kfree(itv->vbi.sliced_mpeg_data[i]); - printk(KERN_INFO "ivtv: Removed %s\n", itv->card_name); + pr_info("Removed %s\n", itv->card_name); v4l2_device_unregister(&itv->v4l2_dev); kfree(itv); @@ -1468,25 +1468,25 @@ static struct pci_driver ivtv_pci_driver = { static int __init module_start(void) { - printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION); + pr_info("Start initialization, version %s\n", IVTV_VERSION); /* Validate parameters */ if (ivtv_first_minor < 0 || ivtv_first_minor >= IVTV_MAX_CARDS) { - printk(KERN_ERR "ivtv: Exiting, ivtv_first_minor must be between 0 and %d\n", + pr_err("Exiting, ivtv_first_minor must be between 0 and %d\n", IVTV_MAX_CARDS - 1); return -1; } if (ivtv_debug < 0 || ivtv_debug > 2047) { ivtv_debug = 0; - printk(KERN_INFO "ivtv: Debug value must be >= 0 and <= 2047\n"); + pr_info("Debug value must be >= 0 and <= 2047\n"); } if (pci_register_driver(&ivtv_pci_driver)) { - printk(KERN_ERR "ivtv: Error detecting PCI card\n"); + pr_err("Error detecting PCI card\n"); return -ENODEV; } - printk(KERN_INFO "ivtv: End initialization\n"); + pr_info("End initialization\n"); return 0; } diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h index 6b09a9514d64..cde452e30746 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.h +++ b/drivers/media/pci/ivtv/ivtv-driver.h @@ -22,6 +22,8 @@ #ifndef IVTV_DRIVER_H #define IVTV_DRIVER_H +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + /* Internal header for ivtv project: * Driver for the cx23415/6 chip. * Author: Kevin Thayer (nufan_wfk at yahoo.com) @@ -36,38 +38,37 @@ * using information provided by Jiun-Kuei Jung @ AVerMedia. */ -#include <linux/module.h> -#include <linux/init.h> +#include <asm/byteorder.h> #include <linux/delay.h> -#include <linux/sched.h> +#include <linux/device.h> #include <linux/fs.h> -#include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/ivtv.h> +#include <linux/kernel.h> +#include <linux/kthread.h> #include <linux/list.h> -#include <linux/unistd.h> +#include <linux/module.h> +#include <linux/mutex.h> #include <linux/pagemap.h> +#include <linux/pci.h> #include <linux/scatterlist.h> -#include <linux/kthread.h> -#include <linux/mutex.h> +#include <linux/sched.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/uaccess.h> -#include <asm/byteorder.h> +#include <linux/unistd.h> -#include <linux/dvb/video.h> -#include <linux/dvb/audio.h> +#include <media/drv-intf/cx2341x.h> +#include <media/i2c/ir-kbd-i2c.h> +#include <media/tuner.h> #include <media/v4l2-common.h> -#include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-fh.h> -#include <media/tuner.h> -#include <media/drv-intf/cx2341x.h> -#include <media/i2c/ir-kbd-i2c.h> - -#include <linux/ivtv.h> +#include <media/v4l2-ioctl.h> /* Memory layout */ #define IVTV_ENCODER_OFFSET 0x00000000 diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c index 2dc4b20f3ac0..f956188f7f19 100644 --- a/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/drivers/media/pci/ivtv/ivtv-ioctl.c @@ -35,7 +35,10 @@ #include <media/i2c/saa7127.h> #include <media/tveeprom.h> #include <media/v4l2-event.h> +#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS #include <linux/dvb/audio.h> +#include <linux/dvb/video.h> +#endif u16 ivtv_service2vbi(int type) { @@ -1620,13 +1623,23 @@ static int ivtv_try_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder return ivtv_video_command(itv, id, dec, true); } +#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS +static __inline__ void warn_deprecated_ioctl(const char *name) +{ + pr_warn_once("warning: the %s ioctl is deprecated. Don't use it, as it will be removed soon\n", + name); +} +#endif + static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) { struct ivtv_open_id *id = fh2id(filp->private_data); struct ivtv *itv = id->itv; - int nonblocking = filp->f_flags & O_NONBLOCK; struct ivtv_stream *s = &itv->streams[id->type]; +#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS + int nonblocking = filp->f_flags & O_NONBLOCK; unsigned long iarg = (unsigned long)arg; +#endif switch (cmd) { case IVTV_IOC_DMA_FRAME: { @@ -1658,12 +1671,12 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) return -EINVAL; return ivtv_passthrough_mode(itv, *(int *)arg != 0); - +#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS case VIDEO_GET_PTS: { s64 *pts = arg; s64 frame; - IVTV_DEBUG_IOCTL("VIDEO_GET_PTS\n"); + warn_deprecated_ioctl("VIDEO_GET_PTS"); if (s->type < IVTV_DEC_STREAM_TYPE_MPG) { *pts = s->dma_pts; break; @@ -1677,7 +1690,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) s64 *frame = arg; s64 pts; - IVTV_DEBUG_IOCTL("VIDEO_GET_FRAME_COUNT\n"); + warn_deprecated_ioctl("VIDEO_GET_FRAME_COUNT"); if (s->type < IVTV_DEC_STREAM_TYPE_MPG) { *frame = 0; break; @@ -1690,7 +1703,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) case VIDEO_PLAY: { struct v4l2_decoder_cmd dc; - IVTV_DEBUG_IOCTL("VIDEO_PLAY\n"); + warn_deprecated_ioctl("VIDEO_PLAY"); memset(&dc, 0, sizeof(dc)); dc.cmd = V4L2_DEC_CMD_START; return ivtv_video_command(itv, id, &dc, 0); @@ -1699,7 +1712,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) case VIDEO_STOP: { struct v4l2_decoder_cmd dc; - IVTV_DEBUG_IOCTL("VIDEO_STOP\n"); + warn_deprecated_ioctl("VIDEO_STOP"); memset(&dc, 0, sizeof(dc)); dc.cmd = V4L2_DEC_CMD_STOP; dc.flags = V4L2_DEC_CMD_STOP_TO_BLACK | V4L2_DEC_CMD_STOP_IMMEDIATELY; @@ -1709,7 +1722,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) case VIDEO_FREEZE: { struct v4l2_decoder_cmd dc; - IVTV_DEBUG_IOCTL("VIDEO_FREEZE\n"); + warn_deprecated_ioctl("VIDEO_FREEZE"); memset(&dc, 0, sizeof(dc)); dc.cmd = V4L2_DEC_CMD_PAUSE; return ivtv_video_command(itv, id, &dc, 0); @@ -1718,7 +1731,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) case VIDEO_CONTINUE: { struct v4l2_decoder_cmd dc; - IVTV_DEBUG_IOCTL("VIDEO_CONTINUE\n"); + warn_deprecated_ioctl("VIDEO_CONTINUE"); memset(&dc, 0, sizeof(dc)); dc.cmd = V4L2_DEC_CMD_RESUME; return ivtv_video_command(itv, id, &dc, 0); @@ -1732,9 +1745,9 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) int try = (cmd == VIDEO_TRY_COMMAND); if (try) - IVTV_DEBUG_IOCTL("VIDEO_TRY_COMMAND %d\n", dc->cmd); + warn_deprecated_ioctl("VIDEO_TRY_COMMAND"); else - IVTV_DEBUG_IOCTL("VIDEO_COMMAND %d\n", dc->cmd); + warn_deprecated_ioctl("VIDEO_COMMAND"); return ivtv_video_command(itv, id, dc, try); } @@ -1742,7 +1755,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) struct video_event *ev = arg; DEFINE_WAIT(wait); - IVTV_DEBUG_IOCTL("VIDEO_GET_EVENT\n"); + warn_deprecated_ioctl("VIDEO_GET_EVENT"); if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) return -EINVAL; memset(ev, 0, sizeof(*ev)); @@ -1785,28 +1798,28 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) } case VIDEO_SELECT_SOURCE: - IVTV_DEBUG_IOCTL("VIDEO_SELECT_SOURCE\n"); + warn_deprecated_ioctl("VIDEO_SELECT_SOURCE"); if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) return -EINVAL; return ivtv_passthrough_mode(itv, iarg == VIDEO_SOURCE_DEMUX); case AUDIO_SET_MUTE: - IVTV_DEBUG_IOCTL("AUDIO_SET_MUTE\n"); + warn_deprecated_ioctl("AUDIO_SET_MUTE"); itv->speed_mute_audio = iarg; return 0; case AUDIO_CHANNEL_SELECT: - IVTV_DEBUG_IOCTL("AUDIO_CHANNEL_SELECT\n"); + warn_deprecated_ioctl("AUDIO_CHANNEL_SELECT"); if (iarg > AUDIO_STEREO_SWAPPED) return -EINVAL; return v4l2_ctrl_s_ctrl(itv->ctrl_audio_playback, iarg + 1); case AUDIO_BILINGUAL_CHANNEL_SELECT: - IVTV_DEBUG_IOCTL("AUDIO_BILINGUAL_CHANNEL_SELECT\n"); + warn_deprecated_ioctl("AUDIO_BILINGUAL_CHANNEL_SELECT"); if (iarg > AUDIO_STEREO_SWAPPED) return -EINVAL; return v4l2_ctrl_s_ctrl(itv->ctrl_audio_multilingual_playback, iarg + 1); - +#endif default: return -EINVAL; } @@ -1821,6 +1834,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, if (!valid_prio) { switch (cmd) { case IVTV_IOC_PASSTHROUGH_MODE: +#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS case VIDEO_PLAY: case VIDEO_STOP: case VIDEO_FREEZE: @@ -1830,6 +1844,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, case AUDIO_SET_MUTE: case AUDIO_CHANNEL_SELECT: case AUDIO_BILINGUAL_CHANNEL_SELECT: +#endif return -EBUSY; } } @@ -1847,6 +1862,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, case IVTV_IOC_DMA_FRAME: case IVTV_IOC_PASSTHROUGH_MODE: +#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS case VIDEO_GET_PTS: case VIDEO_GET_FRAME_COUNT: case VIDEO_GET_EVENT: @@ -1860,6 +1876,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, case AUDIO_SET_MUTE: case AUDIO_CHANNEL_SELECT: case AUDIO_BILINGUAL_CHANNEL_SELECT: +#endif return ivtv_decoder_ioctls(file, cmd, (void *)arg); default: diff --git a/drivers/media/pci/ivtv/ivtv-mailbox.c b/drivers/media/pci/ivtv/ivtv-mailbox.c index e3ce96763785..9a2506a5edbe 100644 --- a/drivers/media/pci/ivtv/ivtv-mailbox.c +++ b/drivers/media/pci/ivtv/ivtv-mailbox.c @@ -19,11 +19,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - #include "ivtv-driver.h" #include "ivtv-mailbox.h" +#include <stdarg.h> + /* Firmware mailbox flags*/ #define IVTV_MBOX_FIRMWARE_DONE 0x00000004 #define IVTV_MBOX_DRIVER_DONE 0x00000002 diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c index 612a8402cf4d..621b2f613d81 100644 --- a/drivers/media/pci/ivtv/ivtvfb.c +++ b/drivers/media/pci/ivtv/ivtvfb.c @@ -38,25 +38,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include "ivtv-driver.h" +#include "ivtv-cards.h" +#include "ivtv-i2c.h" +#include "ivtv-udma.h" +#include "ivtv-mailbox.h" +#include "ivtv-firmware.h" -#include <linux/module.h> -#include <linux/kernel.h> #include <linux/fb.h> #include <linux/ivtvfb.h> -#include <linux/slab.h> #ifdef CONFIG_X86_64 #include <asm/pat.h> #endif -#include "ivtv-driver.h" -#include "ivtv-cards.h" -#include "ivtv-i2c.h" -#include "ivtv-udma.h" -#include "ivtv-mailbox.h" -#include "ivtv-firmware.h" - /* card parameters */ static int ivtvfb_card_id = -1; static int ivtvfb_debug = 0; @@ -1275,7 +1270,7 @@ static int __init ivtvfb_init(void) if (ivtvfb_card_id < -1 || ivtvfb_card_id >= IVTV_MAX_CARDS) { - printk(KERN_ERR "ivtvfb: ivtvfb_card_id parameter is out of range (valid range: -1 - %d)\n", + pr_err("ivtvfb_card_id parameter is out of range (valid range: -1 - %d)\n", IVTV_MAX_CARDS - 1); return -EINVAL; } @@ -1284,7 +1279,7 @@ static int __init ivtvfb_init(void) err = driver_for_each_device(drv, NULL, ®istered, ivtvfb_callback_init); (void)err; /* suppress compiler warning */ if (!registered) { - printk(KERN_ERR "ivtvfb: no cards found\n"); + pr_err("no cards found\n"); return -ENODEV; } return 0; @@ -1295,7 +1290,7 @@ static void ivtvfb_cleanup(void) struct device_driver *drv; int err; - printk(KERN_INFO "ivtvfb: Unloading framebuffer module\n"); + pr_info("Unloading framebuffer module\n"); drv = driver_find("ivtv", &pci_bus_type); err = driver_for_each_device(drv, NULL, NULL, ivtvfb_callback_cleanup); |