diff options
| author | Antti Palosaari <crope@iki.fi> | 2008-05-28 04:01:04 +0300 |
|---|---|---|
| committer | Antti Palosaari <crope@iki.fi> | 2008-05-28 04:01:04 +0300 |
| commit | b1fe778562f674e76125918232a24f8ff94cccba (patch) | |
| tree | 3e2bdb9af23465e34f5ca03776173371ce0961ba /linux | |
| parent | d0d7c2a003a0f7736b0854159f8c3d1127b49269 (diff) | |
| download | mediapointer-dvb-s2-b1fe778562f674e76125918232a24f8ff94cccba.tar.gz mediapointer-dvb-s2-b1fe778562f674e76125918232a24f8ff94cccba.tar.bz2 | |
AU6610: remove useless identify_state
From: Antti Palosaari <crope@iki.fi>
- remove useless identify_state - device is always warm
Signed-off-by: Antti Palosaari <crope@iki.fi>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/au6610.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/au6610.c b/linux/drivers/media/dvb/dvb-usb/au6610.c index a278c1a7d..a9ded9f3a 100644 --- a/linux/drivers/media/dvb/dvb-usb/au6610.c +++ b/linux/drivers/media/dvb/dvb-usb/au6610.c @@ -115,15 +115,6 @@ static struct i2c_algorithm au6610_i2c_algo = { }; /* Callbacks for DVB USB */ -static int au6610_identify_state(struct usb_device *udev, - struct dvb_usb_device_properties *props, - struct dvb_usb_device_description **desc, - int *cold) -{ - *cold = 0; - return 0; -} - static struct zl10353_config au6610_zl10353_config = { .demod_address = 0x0f, .no_tuner = 1, @@ -191,7 +182,6 @@ static struct dvb_usb_device_properties au6610_properties = { .caps = DVB_USB_IS_AN_I2C_ADAPTER, .usb_ctrl = DEVICE_SPECIFIC, .size_of_priv = 0, - .identify_state = au6610_identify_state, .num_adapters = 1, .adapter = { { @@ -213,12 +203,13 @@ static struct dvb_usb_device_properties au6610_properties = { } }, .i2c_algo = &au6610_i2c_algo, + .num_device_descs = 1, .devices = { { - "Sigmatek DVB-110 DVB-T USB2.0", - { &au6610_table[0], NULL }, - { NULL }, + .name = "Sigmatek DVB-110 DVB-T USB2.0", + .cold_ids = {NULL}, + .warm_ids = {&au6610_table[0], NULL}, }, } }; |