From 52d757eaeaa6dcd9e2b67baba614447a6c2e9ace Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Thu, 22 Nov 2007 21:26:01 +0100 Subject: [PATCH] --- yaml --- r: 74081 b: refs/heads/master c: cdb32706f6948238ed6d1d85473c64c27366e9e9 h: refs/heads/master i: 74079: 8585143db642666c7339a9d310685040953bb5e5 v: v3 --- [refs] | 2 +- trunk/Documentation/parport-lowlevel.txt | 4 ++++ trunk/drivers/net/plip.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dcb67e7087c4..ff63a61806d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6ce5cca74b8681fdf1d7307edc66a7213b43f6f +refs/heads/master: cdb32706f6948238ed6d1d85473c64c27366e9e9 diff --git a/trunk/Documentation/parport-lowlevel.txt b/trunk/Documentation/parport-lowlevel.txt index 265fcdcb8e5f..120eb20dbb09 100644 --- a/trunk/Documentation/parport-lowlevel.txt +++ b/trunk/Documentation/parport-lowlevel.txt @@ -339,6 +339,10 @@ Use this function to register your device driver on a parallel port ('port'). Once you have done that, you will be able to use parport_claim and parport_release in order to use the port. +The ('name') argument is the name of the device that appears in /proc +filesystem. The string must be valid for the whole lifetime of the +device (until parport_unregister_device is called). + This function will register three callbacks into your driver: 'preempt', 'wakeup' and 'irq'. Each of these may be NULL in order to indicate that you do not want a callback. diff --git a/trunk/drivers/net/plip.c b/trunk/drivers/net/plip.c index baf2cbfc8863..57c98669984d 100644 --- a/trunk/drivers/net/plip.c +++ b/trunk/drivers/net/plip.c @@ -1269,7 +1269,7 @@ static void plip_attach (struct parport *port) nl = netdev_priv(dev); nl->dev = dev; - nl->pardev = parport_register_device(port, name, plip_preempt, + nl->pardev = parport_register_device(port, dev->name, plip_preempt, plip_wakeup, plip_interrupt, 0, dev);