aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/daisy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/parport/daisy.c')
-rw-r--r--drivers/parport/daisy.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 5bbff2028f8f..3c8f06c3a5a0 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -199,11 +199,6 @@ void parport_daisy_fini(struct parport *port)
199 * parport_open - find a device by canonical device number 199 * parport_open - find a device by canonical device number
200 * @devnum: canonical device number 200 * @devnum: canonical device number
201 * @name: name to associate with the device 201 * @name: name to associate with the device
202 * @pf: preemption callback
203 * @kf: kick callback
204 * @irqf: interrupt handler
205 * @flags: registration flags
206 * @handle: driver data
207 * 202 *
208 * This function is similar to parport_register_device(), except 203 * This function is similar to parport_register_device(), except
209 * that it locates a device by its number rather than by the port 204 * that it locates a device by its number rather than by the port
@@ -214,10 +209,7 @@ void parport_daisy_fini(struct parport *port)
214 * for parport_register_device(). 209 * for parport_register_device().
215 **/ 210 **/
216 211
217struct pardevice *parport_open(int devnum, const char *name, 212struct pardevice *parport_open(int devnum, const char *name)
218 int (*pf) (void *), void (*kf) (void *),
219 void (*irqf) (int, void *),
220 int flags, void *handle)
221{ 213{
222 struct daisydev *p = topology; 214 struct daisydev *p = topology;
223 struct parport *port; 215 struct parport *port;
@@ -237,8 +229,7 @@ struct pardevice *parport_open(int devnum, const char *name,
237 port = parport_get_port(p->port); 229 port = parport_get_port(p->port);
238 spin_unlock(&topology_lock); 230 spin_unlock(&topology_lock);
239 231
240 dev = parport_register_device(port, name, pf, kf, 232 dev = parport_register_device(port, name, NULL, NULL, NULL, 0, NULL);
241 irqf, flags, handle);
242 parport_put_port(port); 233 parport_put_port(port);
243 if (!dev) 234 if (!dev)
244 return NULL; 235 return NULL;