Skip to content

Commit

Permalink
V4L/DVB (3762): Add sysfs device links to dvb devices
Browse files Browse the repository at this point in the history 
Currently in /sys/class/dvb/dvbX.demuxY/ we have:
	dev
	uevent
With the patch, we have (for a PCI DVB device):
	dev
	device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:03:0d.0
	uevent
So userspace tools can (finally) work out which physical device a DVB adapter
refers to. Previously you had to kinda look through dmesg and hope that it
hadn't been dumped out of the buffer. This makes debugging a lot easier if
the system has been up for a long time!
This is done by adding an extra 'struct device *' parameter to
dvb_register_adapter(). It will work with any kind of standard
linux 'device'. Additionally, if someone has an embedded system which does
things differently, they can simply supply 'NULL' and the behaviour will be
as before - the link will simply not appear.

Ack'd-by: Manu Abraham <manu@linuxtv.org>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Andrew de Quincey authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 76d313b commit d09dbf9
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 17 deletions.
2 changes: 1 addition & 1 deletion drivers/media/dvb/b2c2/flexcop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int flexcop_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
static int flexcop_dvb_init(struct flexcop_device *fc)
{
int ret;
if ((ret = dvb_register_adapter(&fc->dvb_adapter,"FlexCop Digital TV device",fc->owner)) < 0) {
if ((ret = dvb_register_adapter(&fc->dvb_adapter,"FlexCop Digital TV device",fc->owner,fc->dev)) < 0) {
err("error registering DVB adapter");
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/bt8xx/dvb-bt8xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
{
int result;

if ((result = dvb_register_adapter(&card->dvb_adapter, card->card_name, THIS_MODULE)) < 0) {
if ((result = dvb_register_adapter(&card->dvb_adapter, card->card_name, THIS_MODULE, &card->bt->dev->dev)) < 0) {
printk("dvb_bt8xx: dvb_register_adapter failed (errno = %d)\n", result);
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/cinergyT2/cinergyT2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ static int cinergyt2_probe (struct usb_interface *intf,
return -ENOMEM;
}

if ((err = dvb_register_adapter(&cinergyt2->adapter, DRIVER_NAME, THIS_MODULE)) < 0) {
if ((err = dvb_register_adapter(&cinergyt2->adapter, DRIVER_NAME, THIS_MODULE, &cinergyt2->udev->dev)) < 0) {
kfree(cinergyt2);
return err;
}
Expand Down
5 changes: 3 additions & 2 deletions drivers/media/dvb/dvb-core/dvbdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
"dvb/adapter%d/%s%d", adap->num, dnames[type], id);

class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
adap->device, "dvb%d.%s%d", adap->num, dnames[type], id);

dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
adap->num, dnames[type], id, nums2minor(adap->num, type, id),
Expand Down Expand Up @@ -285,7 +285,7 @@ static int dvbdev_get_free_adapter_num (void)
}


int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module)
int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module, struct device *device)
{
int num;

Expand All @@ -306,6 +306,7 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
adap->num = num;
adap->name = name;
adap->module = module;
adap->device = device;

list_add_tail (&adap->list_head, &dvb_adapter_list);

Expand Down
4 changes: 3 additions & 1 deletion drivers/media/dvb/dvb-core/dvbdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ struct dvb_adapter {
u8 proposed_mac [6];
void* priv;

struct device *device;

struct module *module;
};

Expand All @@ -76,7 +78,7 @@ struct dvb_device {
};


extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module);
extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module, struct device *device);
extern int dvb_unregister_adapter (struct dvb_adapter *adap);

extern int dvb_register_device (struct dvb_adapter *adap,
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int dvb_usb_dvb_init(struct dvb_usb_device *d)
int ret;

if ((ret = dvb_register_adapter(&d->dvb_adap, d->desc->name,
d->owner)) < 0) {
d->owner, &d->udev->dev)) < 0) {
deb_info("dvb_register_adapter failed: error %d", ret);
goto err;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/pluto2/pluto2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
goto err_pluto_hw_exit;

/* dvb */
ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE);
ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE, &pdev->dev);
if (ret < 0)
goto err_i2c_bit_del_bus;

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttpci/av7110.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2413,7 +2413,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
goto err_kfree_0;

ret = dvb_register_adapter(&av7110->dvb_adapter, av7110->card_name,
THIS_MODULE);
THIS_MODULE, &dev->pci->dev);
if (ret < 0)
goto err_put_firmware_1;

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttpci/budget-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
budget->dev->name, budget->buffer_width, budget->buffer_height);
printk("%s: dma buffer size %u\n", budget->dev->name, budget->buffer_size);

if ((ret = dvb_register_adapter(&budget->dvb_adapter, budget->card->name, owner)) < 0) {
if ((ret = dvb_register_adapter(&budget->dvb_adapter, budget->card->name, owner, &budget->dev->pci->dev)) < 0) {
return ret;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i

mutex_unlock(&ttusb->semi2c);

if ((result = dvb_register_adapter(&ttusb->adapter, "Technotrend/Hauppauge Nova-USB", THIS_MODULE)) < 0) {
if ((result = dvb_register_adapter(&ttusb->adapter, "Technotrend/Hauppauge Nova-USB", THIS_MODULE, &udev->dev)) < 0) {
ttusb_free_iso_urbs(ttusb);
kfree(ttusb);
return result;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttusb-dec/ttusb_dec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1432,7 +1432,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
dprintk("%s\n", __FUNCTION__);

if ((result = dvb_register_adapter(&dec->adapter,
dec->model_name, THIS_MODULE)) < 0) {
dec->model_name, THIS_MODULE, &dec->udev->dev)) < 0) {
printk("%s: dvb_register_adapter failed: error %d\n",
__FUNCTION__, result);

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/cx88/cx88-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ static int dvb_register(struct cx8802_dev *dev)
cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);

/* register everything */
return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev);
}

/* ----------------------------------------------------------- */
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/saa7134/saa7134-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ static int dvb_init(struct saa7134_dev *dev)
}

/* register everything else */
return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev);
}

static int dvb_fini(struct saa7134_dev *dev)
Expand Down
5 changes: 3 additions & 2 deletions drivers/media/video/video-buf-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,15 @@ static int videobuf_dvb_stop_feed(struct dvb_demux_feed *feed)

int videobuf_dvb_register(struct videobuf_dvb *dvb,
struct module *module,
void *adapter_priv)
void *adapter_priv,
struct device *device)
{
int result;

mutex_init(&dvb->lock);

/* register adapter */
result = dvb_register_adapter(&dvb->adapter, dvb->name, module);
result = dvb_register_adapter(&dvb->adapter, dvb->name, module, device);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n",
dvb->name, result);
Expand Down
3 changes: 2 additions & 1 deletion include/media/video-buf-dvb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ struct videobuf_dvb {

int videobuf_dvb_register(struct videobuf_dvb *dvb,
struct module *module,
void *adapter_priv);
void *adapter_priv,
struct device *device);
void videobuf_dvb_unregister(struct videobuf_dvb *dvb);

/*
Expand Down

0 comments on commit d09dbf9

Please sign in to comment.