aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2008-05-28 21:04:12 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-26 14:58:44 -0400
commitea3a13b7a19f0d7d7344494047c9aa8bb32b6678 (patch)
tree97625d8cebe60d36029187a4935b4ccc0eba5164 /drivers/media
parentf56ebe16b045861d26b81ef6683445c0144362b8 (diff)
V4L/DVB (8013): gl861: remove useless identify_state
- remove useless identify_state - device is always warm Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/gl861.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index 10cc436b0654..9e53650ac9d3 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -94,16 +94,6 @@ static struct i2c_algorithm gl861_i2c_algo = {
94}; 94};
95 95
96/* Callbacks for DVB USB */ 96/* Callbacks for DVB USB */
97static int gl861_identify_state(struct usb_device *udev,
98 struct dvb_usb_device_properties *props,
99 struct dvb_usb_device_description **desc,
100 int *cold)
101{
102 *cold = 0;
103
104 return 0;
105}
106
107static struct zl10353_config gl861_zl10353_config = { 97static struct zl10353_config gl861_zl10353_config = {
108 .demod_address = 0x0f, 98 .demod_address = 0x0f,
109 .no_tuner = 1, 99 .no_tuner = 1,
@@ -174,7 +164,6 @@ static struct dvb_usb_device_properties gl861_properties = {
174 164
175 .size_of_priv = 0, 165 .size_of_priv = 0,
176 166
177 .identify_state = gl861_identify_state,
178 .num_adapters = 1, 167 .num_adapters = 1,
179 .adapter = {{ 168 .adapter = {{
180 169
@@ -196,13 +185,15 @@ static struct dvb_usb_device_properties gl861_properties = {
196 185
197 .num_device_descs = 2, 186 .num_device_descs = 2,
198 .devices = { 187 .devices = {
199 { "MSI Mega Sky 55801 DVB-T USB2.0", 188 {
200 { &gl861_table[0], NULL }, 189 .name = "MSI Mega Sky 55801 DVB-T USB2.0",
201 { NULL }, 190 .cold_ids = { NULL },
191 .warm_ids = { &gl861_table[0], NULL },
202 }, 192 },
203 { "A-LINK DTU DVB-T USB2.0", 193 {
204 { &gl861_table[1], NULL }, 194 .name = "A-LINK DTU DVB-T USB2.0",
205 { NULL }, 195 .cold_ids = { NULL },
196 .warm_ids = { &gl861_table[1], NULL },
206 }, 197 },
207 } 198 }
208}; 199};