Merge with 2.3.99-pre6.

1 files changed, 161 insertions, 144 deletions

diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index 27cd907e1..63a185029 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -104,18 +104,19 @@ static void get_lowlevel_driver (void)
 }
 
 /**
- * parport_register_driver - register a parallel port device driver
- * @drv: structure describing the driver
+ *	parport_register_driver - register a parallel port device driver
+ *	@drv: structure describing the driver
  *
- * This can be called by a parallel port device driver in order to
- * receive notifications about ports being found in the system, as
- * well as ports no longer available.
+ *	This can be called by a parallel port device driver in order
+ *	to receive notifications about ports being found in the
+ *	system, as well as ports no longer available.
  *
- * The @drv structure is allocated by the caller and must not be
- * deallocated until after calling parport_unregister_driver().
+ *	The @drv structure is allocated by the caller and must not be
+ *	deallocated until after calling parport_unregister_driver().
  *
- * Returns 0 on success.  Currently it always succeeds.
+ *	Returns 0 on success.  Currently it always succeeds.
  **/
+
 int parport_register_driver (struct parport_driver *drv)
 {
 	struct parport *port;
@@ -135,22 +136,23 @@ int parport_register_driver (struct parport_driver *drv)
 }
 
 /**
- * parport_unregister_driver - deregister a parallel port device driver
- * @arg: structure describing the driver that was given to
- *       parport_register_driver()
+ *	parport_unregister_driver - deregister a parallel port device driver
+ *	@arg: structure describing the driver that was given to
+ *	      parport_register_driver()
  *
- * This should be called by a parallel port device driver that has
- * registered itself using parport_register_driver() when it is about
- * to be unloaded.
+ *	This should be called by a parallel port device driver that
+ *	has registered itself using parport_register_driver() when it
+ *	is about to be unloaded.
  *
- * When it returns, the driver's attach() routine will no longer be
- * called, and for each port that attach() was called for, the
- * detach() routine will hae been called.
+ *	When it returns, the driver's attach() routine will no longer
+ *	be called, and for each port that attach() was called for, the
+ *	detach() routine will have been called.
  *
- * If the caller's attach() function can block, it is their
- * responsibility to make sure to wait for it to exit before
- * unloading.
+ *	If the caller's attach() function can block, it is their
+ *	responsibility to make sure to wait for it to exit before
+ *	unloading.
  **/
+
 void parport_unregister_driver (struct parport_driver *arg)
 {
 	struct parport_driver *drv = driver_chain, *olddrv = NULL;
@@ -180,16 +182,17 @@ void parport_unregister_driver (struct parport_driver *arg)
 }
 
 /**
- * parport_enumerate - return a list of the system's parallel ports
+ *	parport_enumerate - return a list of the system's parallel ports
  *
- * This returns the head of the list of parallel ports in the system.
- * The structure that is returned describes the first port in the
- * list, and its 'next' member points to the next port, or %NULL if
- * it's the last port.
+ *	This returns the head of the list of parallel ports in the
+ *	system, as a &struct parport.  The structure that is returned
+ *	describes the first port in the list, and its 'next' member
+ *	points to the next port, or %NULL if it's the last port.
  *
- * If there are no parallel ports in the system, parport_enumerate()
- * will return %NULL.
+ *	If there are no parallel ports in the system,
+ *	parport_enumerate() will return %NULL.
  **/
+
 struct parport *parport_enumerate(void)
 {
 	if (!portlist)
@@ -199,32 +202,34 @@ struct parport *parport_enumerate(void)
 }
 
 /**
- * parport_register_port - register a parallel port
- * @base: base I/O address
- * @irq: IRQ line
- * @dma: DMA channel
- * @ops: pointer to the port driver's port operations structure
+ *	parport_register_port - register a parallel port
+ *	@base: base I/O address
+ *	@irq: IRQ line
+ *	@dma: DMA channel
+ *	@ops: pointer to the port driver's port operations structure
  *
- * When a parallel port (lowlevel) driver finds a port that should be
- * made available to parallel port device drivers, it should call
- * parport_register_port().  The @base, @irq, and @dma parameters are
- * for the convenience of port drivers, and for ports where they
- * aren't meaningful needn't be set to anything special.  They can be
- * altered afterwards by adjusting the relevant members of the parport
- * structure that is returned and represents the port.  They should
- * not be tampered with after calling parport_announce_port, however.
+ *	When a parallel port (lowlevel) driver finds a port that
+ *	should be made available to parallel port device drivers, it
+ *	should call parport_register_port().  The @base, @irq, and
+ *	@dma parameters are for the convenience of port drivers, and
+ *	for ports where they aren't meaningful needn't be set to
+ *	anything special.  They can be altered afterwards by adjusting
+ *	the relevant members of the parport structure that is returned
+ *	and represents the port.  They should not be tampered with
+ *	after calling parport_announce_port, however.
  *
- * If there are parallel port device drivers in the system that have
- * registered themselves using parport_register_driver(), they are not
- * told about the port at this time; that is done by
- * parport_announce_port().
+ *	If there are parallel port device drivers in the system that
+ *	have registered themselves using parport_register_driver(),
+ *	they are not told about the port at this time; that is done by
+ *	parport_announce_port().
  *
- * The @ops structure is allocated by the caller, and must not be
- * deallocated before calling parport_unregister_port().
+ *	The @ops structure is allocated by the caller, and must not be
+ *	deallocated before calling parport_unregister_port().
  *
- * If there is no memory to allocate a new parport structure, this
- * function will return %NULL.
+ *	If there is no memory to allocate a new parport structure,
+ *	this function will return %NULL.
  **/
+
 struct parport *parport_register_port(unsigned long base, int irq, int dma,
 				      struct parport_operations *ops)
 {
@@ -310,16 +315,17 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma,
 }
 
 /**
- * parport_announce_port - tell device drivers about a parallel port
- * @port: parallel port to announce
+ *	parport_announce_port - tell device drivers about a parallel port
+ *	@port: parallel port to announce
  *
- * After a port driver has registered a parallel port with
- * parport_register_port, and performed any necessary initialisation
- * or adjustments, it should call parport_announce_port() in order to
- * notify all device drivers that have called
- * parport_register_driver().  Their attach() functions will be
- * called, with @port as the parameter.
+ *	After a port driver has registered a parallel port with
+ *	parport_register_port, and performed any necessary
+ *	initialisation or adjustments, it should call
+ *	parport_announce_port() in order to notify all device drivers
+ *	that have called parport_register_driver().  Their attach()
+ *	functions will be called, with @port as the parameter.
  **/
+
 void parport_announce_port (struct parport *port)
 {
 #ifdef CONFIG_PARPORT_1284
@@ -364,22 +370,24 @@ static void free_port (struct parport *port)
 }
 
 /**
- * parport_unregister_port - deregister a parallel port
- * @port: parallel port to deregister
+ *	parport_unregister_port - deregister a parallel port
+ *	@port: parallel port to deregister
  *
- * When a parallel port driver is forcibly unloaded, or a parallel
- * port becomes inaccessible, the port driver must call this function
- * in order to deal with device drivers that still want to use it.
+ *	When a parallel port driver is forcibly unloaded, or a
+ *	parallel port becomes inaccessible, the port driver must call
+ *	this function in order to deal with device drivers that still
+ *	want to use it.
  *
- * The parport structure associated with the port has its operations
- * structure replaced with one containing 'null' operations that
- * return errors or just don't do anything.
+ *	The parport structure associated with the port has its
+ *	operations structure replaced with one containing 'null'
+ *	operations that return errors or just don't do anything.
  *
- * Any drivers that have registered themselves using
- * parport_register_driver() are notified that the port is no longer
- * accessible by having their detach() routines called with @port as
- * the parameter.
+ *	Any drivers that have registered themselves using
+ *	parport_register_driver() are notified that the port is no
+ *	longer accessible by having their detach() routines called
+ *	with @port as the parameter.
  **/
+
 void parport_unregister_port(struct parport *port)
 {
 	struct parport *p;
@@ -415,70 +423,74 @@ void parport_unregister_port(struct parport *port)
 }
 
 /**
- * parport_register_device - register a device on a parallel port
- * @port: port to which the device is attached
- * @name: a name to refer to the device
- * @pf: preemption callback
- * @kf: kick callback (wake-up)
- * @irq_func: interrupt handler
- * @flags: registration flags
- * @handle: data for callback functions
+ *	parport_register_device - register a device on a parallel port
+ *	@port: port to which the device is attached
+ *	@name: a name to refer to the device
+ *	@pf: preemption callback
+ *	@kf: kick callback (wake-up)
+ *	@irq_func: interrupt handler
+ *	@flags: registration flags
+ *	@handle: data for callback functions
  *
- * This function, called by parallel port device drivers, declares
- * that a device is connected to a port, and tells the system all it
- * needs to know.
+ *	This function, called by parallel port device drivers,
+ *	declares that a device is connected to a port, and tells the
+ *	system all it needs to know.
  *
- * The @name is allocated by the caller and must not be deallocated
- * until the caller calls @parport_unregister_device for that device.
+ *	The @name is allocated by the caller and must not be
+ *	deallocated until the caller calls @parport_unregister_device
+ *	for that device.
  *
- * The preemption callback function, @pf, is called when this device
- * driver has claimed access to the port but another device driver
- * wants to use it.  It is given @handle as its parameter, and should
- * return zero if it is willing for the system to release the port to
- * another driver on its behalf.  If it wants to keep control of the
- * port it should return non-zero, and no action will be taken.  It is
- * good manners for the driver to try to release the port at the
- * earliest opportunity after its preemption callback rejects a
- * preemption attempt.  Note that if a preemption callback is happy
- * for preemption to go ahead, there is no need to release the port;
- * it is done automatically.  This function may not block, as it may
- * be called from interrupt context.  If the device driver does not
- * support preemption, @pf can be %NULL.
+ *	The preemption callback function, @pf, is called when this
+ *	device driver has claimed access to the port but another
+ *	device driver wants to use it.  It is given @handle as its
+ *	parameter, and should return zero if it is willing for the
+ *	system to release the port to another driver on its behalf.
+ *	If it wants to keep control of the port it should return
+ *	non-zero, and no action will be taken.  It is good manners for
+ *	the driver to try to release the port at the earliest
+ *	opportunity after its preemption callback rejects a preemption
+ *	attempt.  Note that if a preemption callback is happy for
+ *	preemption to go ahead, there is no need to release the port;
+ *	it is done automatically.  This function may not block, as it
+ *	may be called from interrupt context.  If the device driver
+ *	does not support preemption, @pf can be %NULL.
  *
- * The wake-up ("kick") callback function, @kf, is called when the
- * port is available to be claimed for exclusive access; that is,
- * parport_claim() is guaranteed to succeed when called from inside
- * the wake-up callback function.  If the driver wants to claim the
- * port it should do so; otherwise, it need not take any action.  This
- * function may not block, as it may be called from interrupt context.
- * If the device driver does not want to be explicitly invited to
- * claim the port in this way, @kf can be %NULL.
+ *	The wake-up ("kick") callback function, @kf, is called when
+ *	the port is available to be claimed for exclusive access; that
+ *	is, parport_claim() is guaranteed to succeed when called from
+ *	inside the wake-up callback function.  If the driver wants to
+ *	claim the port it should do so; otherwise, it need not take
+ *	any action.  This function may not block, as it may be called
+ *	from interrupt context.  If the device driver does not want to
+ *	be explicitly invited to claim the port in this way, @kf can
+ *	be %NULL.
  *
- * The interrupt handler, @irq_func, is called when an interrupt
- * arrives from the parallel port.  Note that if a device driver wants
- * to use interrupts it should use parport_enable_irq(), and can also
- * check the irq member of the parport structure representing the
- * port.
+ *	The interrupt handler, @irq_func, is called when an interrupt
+ *	arrives from the parallel port.  Note that if a device driver
+ *	wants to use interrupts it should use parport_enable_irq(),
+ *	and can also check the irq member of the parport structure
+ *	representing the port.
  *
- * The parallel port (lowlevel) driver is the one that has called
- * request_irq() and whose interrupt handler is called first.  This
- * handler does whatever needs to be done to the hardware to
- * acknowledge the interrupt (for PC-style ports there is nothing
- * special to be done).  It then tells the IEEE 1284 code about the
- * interrupt, which may involve reacting to an IEEE 1284 event
- * depending on the current IEEE 1284 phase.  After this, it calls
- * @irq_func.  Needless to say, @irq_func will be called from
- * interrupt context, and may not block.
+ *	The parallel port (lowlevel) driver is the one that has called
+ *	request_irq() and whose interrupt handler is called first.
+ *	This handler does whatever needs to be done to the hardware to
+ *	acknowledge the interrupt (for PC-style ports there is nothing
+ *	special to be done).  It then tells the IEEE 1284 code about
+ *	the interrupt, which may involve reacting to an IEEE 1284
+ *	event depending on the current IEEE 1284 phase.  After this,
+ *	it calls @irq_func.  Needless to say, @irq_func will be called
+ *	from interrupt context, and may not block.
  *
- * The %PARPORT_DEV_EXCL flag is for preventing port sharing, and so
- * should only be used when sharing the port with other device drivers
- * is impossible and would lead to incorrect behaviour.  Use it
- * sparingly!  Normally, @flags will be zero.
+ *	The %PARPORT_DEV_EXCL flag is for preventing port sharing, and
+ *	so should only be used when sharing the port with other device
+ *	drivers is impossible and would lead to incorrect behaviour.
+ *	Use it sparingly!  Normally, @flags will be zero.
  *
- * This function returns a pointer to a structure that represents the
- * device on the port, or %NULL if there is not enough memory to
- * allocate space for that structure.
+ *	This function returns a pointer to a structure that represents
+ *	the device on the port, or %NULL if there is not enough memory
+ *	to allocate space for that structure.
  **/
+
 struct pardevice *
 parport_register_device(struct parport *port, const char *name,
 			int (*pf)(void *), void (*kf)(void *),
@@ -581,11 +593,12 @@ parport_register_device(struct parport *port, const char *name,
 }
 
 /**
- * parport_unregister_device - deregister a device on a parallel port
- * @dev: pointer to structure representing device
+ *	parport_unregister_device - deregister a device on a parallel port
+ *	@dev: pointer to structure representing device
  *
- * This undoes the effect of parport_register_device().
+ *	This undoes the effect of parport_register_device().
  **/
+
 void parport_unregister_device(struct pardevice *dev)
 {
 	struct parport *port;
@@ -633,15 +646,17 @@ void parport_unregister_device(struct pardevice *dev)
 }
 
 /**
- * parport_claim - claim access to a parallel port device
- * @dev: pointer to structure representing a device on the port
+ *	parport_claim - claim access to a parallel port device
+ *	@dev: pointer to structure representing a device on the port
  *
- * This function will not block and so can be used from interrupt
- * context.  If parport_claim() succeeds in claiming access to the
- * port it returns zero and the port is available to use.  It may fail
- * (returning non-zero) if the port is in use by another driver and
- * that driver is not willing to relinquish control of the port.
+ *	This function will not block and so can be used from interrupt
+ *	context.  If parport_claim() succeeds in claiming access to
+ *	the port it returns zero and the port is available to use.  It
+ *	may fail (returning non-zero) if the port is in use by another
+ *	driver and that driver is not willing to relinquish control of
+ *	the port.
  **/
+
 int parport_claim(struct pardevice *dev)
 {
 	struct pardevice *oldcad;
@@ -744,14 +759,15 @@ blocked:
 }
 
 /**
- * parport_claim_or_block - claim access to a parallel port device
- * @dev: pointer to structure representing a device on the port
+ *	parport_claim_or_block - claim access to a parallel port device
+ *	@dev: pointer to structure representing a device on the port
  *
- * This behaves like parport_claim(), but will block if necessary to
- * wait for the port to be free.  A return value of 1 indicates that
- * it slept; 0 means that it succeeded without needing to sleep.  A
- * negative error code indicates failure.
+ *	This behaves like parport_claim(), but will block if necessary
+ *	to wait for the port to be free.  A return value of 1
+ *	indicates that it slept; 0 means that it succeeded without
+ *	needing to sleep.  A negative error code indicates failure.
  **/
+
 int parport_claim_or_block(struct pardevice *dev)
 {
 	int r;
@@ -795,13 +811,14 @@ int parport_claim_or_block(struct pardevice *dev)
 }
 
 /**
- * parport_release - give up access to a parallel port device
- * @dev: pointer to structure representing parallel port device
+ *	parport_release - give up access to a parallel port device
+ *	@dev: pointer to structure representing parallel port device
  *
- * This function cannot fail, but it should not be called without the
- * port claimed.  Similarly, if the port is already claimed you should
- * not try claiming it again.
+ *	This function cannot fail, but it should not be called without
+ *	the port claimed.  Similarly, if the port is already claimed
+ *	you should not try claiming it again.
  **/
+
 void parport_release(struct pardevice *dev)
 {
 	struct parport *port = dev->port->physport;