diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-03-20 22:00:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:08:11 -0400 |
commit | 44a6481dcd9ec835bbd608b1b2ee47ee62c7e1d8 (patch) | |
tree | caa2f2a13fa44ff50f207706a61199063440a35a /drivers/media/video/cx23885/cx23885-dvb.c | |
parent | 70ebd70573a58a2c0405ef038f1acf74c795eaa5 (diff) |
V4L/DVB (6162): cx23885: whitespace cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-dvb.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 79948553901d..bd0afc2a0447 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -53,11 +53,11 @@ static int dvb_buf_setup(struct videobuf_queue *q, | |||
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, | 56 | static int dvb_buf_prepare(struct videobuf_queue *q, |
57 | enum v4l2_field field) | 57 | struct videobuf_buffer *vb, enum v4l2_field field) |
58 | { | 58 | { |
59 | struct cx23885_tsport *port = q->priv_data; | 59 | struct cx23885_tsport *port = q->priv_data; |
60 | return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb,field); | 60 | return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb, field); |
61 | } | 61 | } |
62 | 62 | ||
63 | static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) | 63 | static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) |
@@ -66,7 +66,8 @@ static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
66 | cx23885_buf_queue(port, (struct cx23885_buffer*)vb); | 66 | cx23885_buf_queue(port, (struct cx23885_buffer*)vb); |
67 | } | 67 | } |
68 | 68 | ||
69 | static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb) | 69 | static void dvb_buf_release(struct videobuf_queue *q, |
70 | struct videobuf_buffer *vb) | ||
70 | { | 71 | { |
71 | cx23885_free_buffer(q, (struct cx23885_buffer*)vb); | 72 | cx23885_free_buffer(q, (struct cx23885_buffer*)vb); |
72 | } | 73 | } |
@@ -116,26 +117,22 @@ static int dvb_register(struct cx23885_tsport *port) | |||
116 | switch (dev->board) { | 117 | switch (dev->board) { |
117 | case CX23885_BOARD_HAUPPAUGE_HVR1800lp: | 118 | case CX23885_BOARD_HAUPPAUGE_HVR1800lp: |
118 | port->dvb.frontend = dvb_attach(s5h1409_attach, | 119 | port->dvb.frontend = dvb_attach(s5h1409_attach, |
119 | &hauppauge_hvr1800lp_config, | 120 | &hauppauge_hvr1800lp_config, |
120 | &dev->i2c_bus[0].i2c_adap); | 121 | &dev->i2c_bus[0].i2c_adap); |
121 | if (port->dvb.frontend != NULL) { | 122 | if (port->dvb.frontend != NULL) { |
122 | dvb_attach(mt2131_attach, | 123 | dvb_attach(mt2131_attach, port->dvb.frontend, |
123 | port->dvb.frontend, | 124 | &dev->i2c_bus[0].i2c_adap, |
124 | &dev->i2c_bus[0].i2c_adap, | 125 | &hauppauge_hvr1800lp_rev2_tunerconfig, 0); |
125 | &hauppauge_hvr1800lp_rev2_tunerconfig, | ||
126 | 0); | ||
127 | } | 126 | } |
128 | break; | 127 | break; |
129 | case CX23885_BOARD_HAUPPAUGE_HVR1800: | 128 | case CX23885_BOARD_HAUPPAUGE_HVR1800: |
130 | port->dvb.frontend = dvb_attach(s5h1409_attach, | 129 | port->dvb.frontend = dvb_attach(s5h1409_attach, |
131 | &hauppauge_hvr1800_config, | 130 | &hauppauge_hvr1800_config, |
132 | &dev->i2c_bus[0].i2c_adap); | 131 | &dev->i2c_bus[0].i2c_adap); |
133 | if (port->dvb.frontend != NULL) { | 132 | if (port->dvb.frontend != NULL) { |
134 | dvb_attach(mt2131_attach, | 133 | dvb_attach(mt2131_attach, port->dvb.frontend, |
135 | port->dvb.frontend, | 134 | &dev->i2c_bus[0].i2c_adap, |
136 | &dev->i2c_bus[0].i2c_adap, | 135 | &hauppauge_hvr1800_tunerconfig, 0); |
137 | &hauppauge_hvr1800_tunerconfig, | ||
138 | 0); | ||
139 | } | 136 | } |
140 | break; | 137 | break; |
141 | default: | 138 | default: |
@@ -152,7 +149,8 @@ static int dvb_register(struct cx23885_tsport *port) | |||
152 | cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); | 149 | cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); |
153 | 150 | ||
154 | /* register everything */ | 151 | /* register everything */ |
155 | return videobuf_dvb_register(&port->dvb, THIS_MODULE, port, &dev->pci->dev); | 152 | return videobuf_dvb_register(&port->dvb, THIS_MODULE, port, |
153 | &dev->pci->dev); | ||
156 | } | 154 | } |
157 | 155 | ||
158 | int cx23885_dvb_register(struct cx23885_tsport *port) | 156 | int cx23885_dvb_register(struct cx23885_tsport *port) |
@@ -160,8 +158,8 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
160 | struct cx23885_dev *dev = port->dev; | 158 | struct cx23885_dev *dev = port->dev; |
161 | int err; | 159 | int err; |
162 | 160 | ||
163 | dprintk( 1, "%s\n", __FUNCTION__); | 161 | dprintk(1, "%s\n", __FUNCTION__); |
164 | dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n", | 162 | dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n", |
165 | dev->board, | 163 | dev->board, |
166 | dev->name, | 164 | dev->name, |
167 | dev->pci_bus, | 165 | dev->pci_bus, |
@@ -173,15 +171,9 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
173 | 171 | ||
174 | /* dvb stuff */ | 172 | /* dvb stuff */ |
175 | printk("%s: cx23885 based dvb card\n", dev->name); | 173 | printk("%s: cx23885 based dvb card\n", dev->name); |
176 | videobuf_queue_init( | 174 | videobuf_queue_init(&port->dvb.dvbq, &dvb_qops, dev->pci, &port->slock, |
177 | &port->dvb.dvbq, | 175 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, |
178 | &dvb_qops, | 176 | sizeof(struct cx23885_buffer), port); |
179 | dev->pci, | ||
180 | &port->slock, | ||
181 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | ||
182 | V4L2_FIELD_TOP, | ||
183 | sizeof(struct cx23885_buffer), | ||
184 | port); | ||
185 | err = dvb_register(port); | 177 | err = dvb_register(port); |
186 | if (err != 0) | 178 | if (err != 0) |
187 | printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err); | 179 | printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err); |
@@ -198,3 +190,10 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port) | |||
198 | 190 | ||
199 | return 0; | 191 | return 0; |
200 | } | 192 | } |
193 | |||
194 | /* | ||
195 | * Local variables: | ||
196 | * c-basic-offset: 8 | ||
197 | * End: | ||
198 | * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off | ||
199 | */ | ||