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

Commit 8ac05ae3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10488): ivtv: cleanup naming conventions 



Use consistent naming for pci_dev, v4l2_device and video_device.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d7493e51

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

+46 −47
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void ivtv_read_eeprom(struct ivtv *itv, struct tveeprom *tv) 
static void ivtv_process_eeprom(struct ivtv *itv)

{

	struct tveeprom tv;

	int pci_slot = PCI_SLOT(itv->dev->devfn);

	int pci_slot = PCI_SLOT(itv->pdev->devfn);



	ivtv_read_eeprom(itv, &tv);
@@ -604,7 +604,7 @@ static void ivtv_process_options(struct ivtv *itv) 
	itv->std = ivtv_parse_std(itv);

	if (itv->std == 0 && tunertype >= 0)

		itv->std = tunertype ? V4L2_STD_MN : (V4L2_STD_ALL & ~V4L2_STD_MN);

	itv->has_cx23415 = (itv->dev->device == PCI_DEVICE_ID_IVTV15);

	itv->has_cx23415 = (itv->pdev->device == PCI_DEVICE_ID_IVTV15);

	chipname = itv->has_cx23415 ? "cx23415" : "cx23416";

	if (itv->options.cardtype == -1) {

		IVTV_INFO("Ignore card (detected %s based chip)\n", chipname);
@@ -617,9 +617,9 @@ static void ivtv_process_options(struct ivtv *itv) 
		IVTV_ERR("Unknown user specified type, trying to autodetect card\n");

	}

	if (itv->card == NULL) {

		if (itv->dev->subsystem_vendor == IVTV_PCI_ID_HAUPPAUGE ||

		    itv->dev->subsystem_vendor == IVTV_PCI_ID_HAUPPAUGE_ALT1 ||

		    itv->dev->subsystem_vendor == IVTV_PCI_ID_HAUPPAUGE_ALT2) {

		if (itv->pdev->subsystem_vendor == IVTV_PCI_ID_HAUPPAUGE ||

		    itv->pdev->subsystem_vendor == IVTV_PCI_ID_HAUPPAUGE_ALT1 ||

		    itv->pdev->subsystem_vendor == IVTV_PCI_ID_HAUPPAUGE_ALT2) {

			itv->card = ivtv_get_card(itv->has_cx23415 ? IVTV_CARD_PVR_350 : IVTV_CARD_PVR_150);

			IVTV_INFO("Autodetected Hauppauge card (%s based)\n",

					chipname);
@@ -630,13 +630,13 @@ static void ivtv_process_options(struct ivtv *itv) 
			if (itv->card->pci_list == NULL)

				continue;

			for (j = 0; itv->card->pci_list[j].device; j++) {

				if (itv->dev->device !=

				if (itv->pdev->device !=

				    itv->card->pci_list[j].device)

					continue;

				if (itv->dev->subsystem_vendor !=

				if (itv->pdev->subsystem_vendor !=

				    itv->card->pci_list[j].subsystem_vendor)

					continue;

				if (itv->dev->subsystem_device !=

				if (itv->pdev->subsystem_device !=

				    itv->card->pci_list[j].subsystem_device)

					continue;

				IVTV_INFO("Autodetected %s card (%s based)\n",
@@ -650,9 +650,9 @@ static void ivtv_process_options(struct ivtv *itv) 
	if (itv->card == NULL) {

		itv->card = ivtv_get_card(IVTV_CARD_PVR_150);

		IVTV_ERR("Unknown card: vendor/device: [%04x:%04x]\n",

		     itv->dev->vendor, itv->dev->device);

		     itv->pdev->vendor, itv->pdev->device);

		IVTV_ERR("              subsystem vendor/device: [%04x:%04x]\n",

		     itv->dev->subsystem_vendor, itv->dev->subsystem_device);

		     itv->pdev->subsystem_vendor, itv->pdev->subsystem_device);

		IVTV_ERR("              %s based\n", chipname);

		IVTV_ERR("Defaulting to %s card\n", itv->card->name);

		IVTV_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
@@ -671,7 +671,7 @@ static void ivtv_process_options(struct ivtv *itv) 
 */

static int __devinit ivtv_init_struct1(struct ivtv *itv)

{

	itv->base_addr = pci_resource_start(itv->dev, 0);

	itv->base_addr = pci_resource_start(itv->pdev, 0);

	itv->enc_mbox.max_mbox = 2; /* the encoder has 3 mailboxes (0-2) */

	itv->dec_mbox.max_mbox = 1; /* the decoder has 2 mailboxes (0-1) */
@@ -682,7 +682,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv) 
	spin_lock_init(&itv->lock);

	spin_lock_init(&itv->dma_reg_lock);



	itv->irq_work_queues = create_singlethread_workqueue(itv->device.name);

	itv->irq_work_queues = create_singlethread_workqueue(itv->v4l2_dev.name);

	if (itv->irq_work_queues == NULL) {

		IVTV_ERR("Could not create ivtv workqueue\n");

		return -1;
@@ -766,7 +766,7 @@ static void __devinit ivtv_init_struct2(struct ivtv *itv) 
	itv->audio_input = itv->card->video_inputs[i].audio_index;

}



static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev,

static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,

			  const struct pci_device_id *pci_id)

{

	u16 cmd;
@@ -775,11 +775,11 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev, 


	IVTV_DEBUG_INFO("Enabling pci device\n");



	if (pci_enable_device(dev)) {

	if (pci_enable_device(pdev)) {

		IVTV_ERR("Can't enable device!\n");

		return -EIO;

	}

	if (pci_set_dma_mask(dev, 0xffffffff)) {

	if (pci_set_dma_mask(pdev, 0xffffffff)) {

		IVTV_ERR("No suitable DMA available.\n");

		return -EIO;

	}
@@ -805,11 +805,11 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev, 
	}



	/* Check for bus mastering */

	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	pci_read_config_word(pdev, PCI_COMMAND, &cmd);

	if (!(cmd & PCI_COMMAND_MASTER)) {

		IVTV_DEBUG_INFO("Attempting to enable Bus Mastering\n");

		pci_set_master(dev);

		pci_read_config_word(dev, PCI_COMMAND, &cmd);

		pci_set_master(pdev);

		pci_read_config_word(pdev, PCI_COMMAND, &cmd);

		if (!(cmd & PCI_COMMAND_MASTER)) {

			IVTV_ERR("Bus Mastering is not enabled\n");

			return -ENXIO;
@@ -817,26 +817,26 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev, 
	}

	IVTV_DEBUG_INFO("Bus Mastering Enabled.\n");



	pci_read_config_byte(dev, PCI_CLASS_REVISION, &card_rev);

	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &pci_latency);

	pci_read_config_byte(pdev, PCI_CLASS_REVISION, &card_rev);

	pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);



	if (pci_latency < 64 && ivtv_pci_latency) {

		IVTV_INFO("Unreasonably low latency timer, "

			       "setting to 64 (was %d)\n", pci_latency);

		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);

		pci_read_config_byte(dev, PCI_LATENCY_TIMER, &pci_latency);

		pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 64);

		pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);

	}

	/* This config space value relates to DMA latencies. The

	   default value 0x8080 is too low however and will lead

	   to DMA errors. 0xffff is the max value which solves

	   these problems. */

	pci_write_config_dword(dev, 0x40, 0xffff);

	pci_write_config_dword(pdev, 0x40, 0xffff);



	IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, "

		   "irq: %d, latency: %d, memory: 0x%lx\n",

		   itv->dev->device, card_rev, dev->bus->number,

		   PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),

		   itv->dev->irq, pci_latency, (unsigned long)itv->base_addr);

		   pdev->device, card_rev, pdev->bus->number,

		   PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),

		   pdev->irq, pci_latency, (unsigned long)itv->base_addr);



	return 0;

}
@@ -935,7 +935,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) 
	}

}



static int __devinit ivtv_probe(struct pci_dev *dev,

static int __devinit ivtv_probe(struct pci_dev *pdev,

				const struct pci_device_id *pci_id)

{

	int retval = 0;
@@ -945,17 +945,17 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	itv = kzalloc(sizeof(struct ivtv), GFP_ATOMIC);

	if (itv == NULL)

		return -ENOMEM;

	itv->dev = dev;

	itv->pdev = pdev;

	itv->instance = atomic_inc_return(&ivtv_instance) - 1;



	retval = v4l2_device_register(&dev->dev, &itv->device);

	retval = v4l2_device_register(&pdev->dev, &itv->v4l2_dev);

	if (retval) {

		kfree(itv);

		return retval;

	}

	/* "ivtv + PCI ID" is a bit of a mouthful, so use

	   "ivtv + instance" instead. */

	snprintf(itv->device.name, sizeof(itv->device.name),

	snprintf(itv->v4l2_dev.name, sizeof(itv->v4l2_dev.name),

			"ivtv%d", itv->instance);

	IVTV_INFO("Initializing card %d\n", itv->instance);
@@ -972,12 +972,11 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr);



	/* PCI Device Setup */

	if ((retval = ivtv_setup_pci(itv, dev, pci_id)) != 0) {

	retval = ivtv_setup_pci(itv, pdev, pci_id);

	if (retval == -EIO)

		goto free_workqueue;

		else if (retval == -ENXIO)

	if (retval == -ENXIO)

		goto free_mem;

	}



	/* map io memory */

	IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",
@@ -1154,8 +1153,8 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	ivtv_set_irq_mask(itv, 0xffffffff);



	/* Register IRQ */

	retval = request_irq(itv->dev->irq, ivtv_irq_handler,

	     IRQF_SHARED | IRQF_DISABLED, itv->device.name, (void *)itv);

	retval = request_irq(itv->pdev->irq, ivtv_irq_handler,

	     IRQF_SHARED | IRQF_DISABLED, itv->v4l2_dev.name, (void *)itv);

	if (retval) {

		IVTV_ERR("Failed to register irq %d\n", retval);

		goto free_i2c;
@@ -1177,7 +1176,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
free_streams:

	ivtv_streams_cleanup(itv, 1);

free_irq:

	free_irq(itv->dev->irq, (void *)itv);

	free_irq(itv->pdev->irq, (void *)itv);

free_i2c:

	exit_ivtv_i2c(itv);

free_io:
@@ -1194,7 +1193,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
		retval = -ENODEV;

	IVTV_ERR("Error %d on initialization\n", retval);



	v4l2_device_unregister(&itv->device);

	v4l2_device_unregister(&itv->v4l2_dev);

	kfree(itv);

	return retval;

}
@@ -1292,10 +1291,10 @@ int ivtv_init_on_first_open(struct ivtv *itv) 
	return 0;

}



static void ivtv_remove(struct pci_dev *pci_dev)

static void ivtv_remove(struct pci_dev *pdev)

{

	struct v4l2_device *dev = dev_get_drvdata(&pci_dev->dev);

	struct ivtv *itv = to_ivtv(dev);

	struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev);

	struct ivtv *itv = to_ivtv(v4l2_dev);

	int i;



	IVTV_DEBUG_INFO("Removing card\n");
@@ -1336,11 +1335,9 @@ static void ivtv_remove(struct pci_dev *pci_dev) 
	ivtv_streams_cleanup(itv, 1);

	ivtv_udma_free(itv);



	v4l2_device_unregister(&itv->device);



	exit_ivtv_i2c(itv);



	free_irq(itv->dev->irq, (void *)itv);

	free_irq(itv->pdev->irq, (void *)itv);

	ivtv_iounmap(itv);



	release_mem_region(itv->base_addr, IVTV_ENCODER_SIZE);
@@ -1348,11 +1345,13 @@ static void ivtv_remove(struct pci_dev *pci_dev) 
	if (itv->has_cx23415)

		release_mem_region(itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);



	pci_disable_device(itv->dev);

	pci_disable_device(itv->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);



	v4l2_device_unregister(&itv->v4l2_dev);

	kfree(itv);

}

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

+12 −12
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ extern int ivtv_debug; 
#define IVTV_DEBUG(x, type, fmt, args...) \

	do { \

		if ((x) & ivtv_debug) \

			v4l2_info(&itv->device, " " type ": " fmt , ##args);	\

			v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args);	\

	} while (0)

#define IVTV_DEBUG_WARN(fmt, args...)  IVTV_DEBUG(IVTV_DBGFLG_WARN,  "warn",  fmt , ## args)

#define IVTV_DEBUG_INFO(fmt, args...)  IVTV_DEBUG(IVTV_DBGFLG_INFO,  "info",  fmt , ## args)
@@ -149,7 +149,7 @@ extern int ivtv_debug; 
#define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \

	do { \

		if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) 	\

			v4l2_info(&itv->device, " " type ": " fmt , ##args);	\

			v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args);	\

	} while (0)

#define IVTV_DEBUG_HI_WARN(fmt, args...)  IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN,  "warn",  fmt , ## args)

#define IVTV_DEBUG_HI_INFO(fmt, args...)  IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_INFO,  "info",  fmt , ## args)
@@ -163,9 +163,9 @@ extern int ivtv_debug; 
#define IVTV_DEBUG_HI_YUV(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_YUV,   "yuv",   fmt , ## args)



/* Standard kernel messages */

#define IVTV_ERR(fmt, args...)      v4l2_err(&itv->device, fmt , ## args)

#define IVTV_WARN(fmt, args...)     v4l2_warn(&itv->device, fmt , ## args)

#define IVTV_INFO(fmt, args...)     v4l2_info(&itv->device, fmt , ## args)

#define IVTV_ERR(fmt, args...)      v4l2_err(&itv->v4l2_dev, fmt , ## args)

#define IVTV_WARN(fmt, args...)     v4l2_warn(&itv->v4l2_dev, fmt , ## args)

#define IVTV_INFO(fmt, args...)     v4l2_info(&itv->v4l2_dev, fmt , ## args)



/* output modes (cx23415 only) */

#define OUT_NONE        0
@@ -315,7 +315,7 @@ struct ivtv; /* forward reference */ 
struct ivtv_stream {

	/* These first four fields are always set, even if the stream

	   is not actually created. */

	struct video_device *v4l2dev;	/* NULL when stream not created */

	struct video_device *vdev;	/* NULL when stream not created */

	struct ivtv *itv; 		/* for ease of use */

	const char *name;		/* name of the stream */

	int type;			/* stream type */
@@ -592,7 +592,7 @@ struct ivtv_card; 
/* Struct to hold info about ivtv cards */

struct ivtv {

	/* General fixed card data */

	struct pci_dev *dev;		/* PCI device */

	struct pci_dev *pdev;		/* PCI device */

	const struct ivtv_card *card;	/* card information */

	const char *card_name;          /* full name of the card */

	const struct ivtv_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */
@@ -612,7 +612,7 @@ struct ivtv { 
	volatile void __iomem *reg_mem; /* pointer to mapped registers */

	struct ivtv_options options; 	/* user options */



	struct v4l2_device device;

	struct v4l2_device v4l2_dev;

	struct v4l2_subdev sd_gpio;	/* GPIO sub-device */

	u16 instance;
@@ -719,9 +719,9 @@ struct ivtv { 
	struct osd_info *osd_info;      /* ivtvfb private OSD info */

};



static inline struct ivtv *to_ivtv(struct v4l2_device *dev)

static inline struct ivtv *to_ivtv(struct v4l2_device *v4l2_dev)

{

	return container_of(dev, struct ivtv, device);

	return container_of(v4l2_dev, struct ivtv, v4l2_dev);

}



/* Globals */
@@ -788,7 +788,7 @@ static inline int ivtv_raw_vbi(const struct ivtv *itv) 
/* Call the specified callback for all subdevs matching hw (if 0, then

   match them all). Ignore any errors. */

#define ivtv_call_hw(itv, hw, o, f, args...) 				\

	__v4l2_device_call_subdevs(&(itv)->device, !(hw) || (sd->grp_id & (hw)), o, f , ##args)

	__v4l2_device_call_subdevs(&(itv)->v4l2_dev, !(hw) || (sd->grp_id & (hw)), o, f , ##args)



#define ivtv_call_all(itv, o, f, args...) ivtv_call_hw(itv, 0, o, f , ##args)
@@ -796,7 +796,7 @@ static inline int ivtv_raw_vbi(const struct ivtv *itv) 
   match them all). If the callback returns an error other than 0 or

   -ENOIOCTLCMD, then return with that error code. */

#define ivtv_call_hw_err(itv, hw, o, f, args...)  		\

	__v4l2_device_call_subdevs_until_err(&(itv)->device, !(hw) || (sd->grp_id & (hw)), o, f , ##args)

	__v4l2_device_call_subdevs_until_err(&(itv)->v4l2_dev, !(hw) || (sd->grp_id & (hw)), o, f , ##args)



#define ivtv_call_all_err(itv, o, f, args...) ivtv_call_hw_err(itv, 0, o, f , ##args)

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

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ int ivtv_v4l2_open(struct file *filp) 
	mutex_lock(&itv->serialize_lock);

	if (ivtv_init_on_first_open(itv)) {

		IVTV_ERR("Failed to initialize on minor %d\n",

				s->v4l2dev->minor);

				vdev->minor);

		mutex_unlock(&itv->serialize_lock);

		return -ENXIO;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv 
	int retries = 3;



retry:

	if (retries && request_firmware(&fw, fn, &itv->dev->dev) == 0) {

	if (retries && request_firmware(&fw, fn, &itv->pdev->dev) == 0) {

		int i;

		volatile u32 __iomem *dst = (volatile u32 __iomem *)mem;

		const u32 *src = (const u32 *)fw->data;

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

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int ivtv_gpio_init(struct ivtv *itv) 
	write_reg(itv->card->gpio_init.initial_value | pin, IVTV_REG_GPIO_OUT);

	write_reg(itv->card->gpio_init.direction | pin, IVTV_REG_GPIO_DIR);

	v4l2_subdev_init(&itv->sd_gpio, &subdev_ops);

	snprintf(itv->sd_gpio.name, sizeof(itv->sd_gpio.name), "%s-gpio", itv->device.name);

	snprintf(itv->sd_gpio.name, sizeof(itv->sd_gpio.name), "%s-gpio", itv->v4l2_dev.name);

	itv->sd_gpio.grp_id = IVTV_HW_GPIO;

	return v4l2_device_register_subdev(&itv->device, &itv->sd_gpio);

	return v4l2_device_register_subdev(&itv->v4l2_dev, &itv->sd_gpio);

}