RE: [PATCH 01/12] staging: comedi: amplc_pc236: reformat header comments

[Hartley Sweeten]

On Friday, July 25, 2014 2:05 AM, Ian Abbott wrote:
> Use preferred style for copyright and driver description comments.
>
> Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
> ---
>  drivers/staging/comedi/drivers/amplc_pc236.c | 92 ++++++++++++++--------------
>  1 file changed, 46 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
> index 243b0f4..9d64e45 100644
> --- a/drivers/staging/comedi/drivers/amplc_pc236.c
> +++ b/drivers/staging/comedi/drivers/amplc_pc236.c
> @@ -1,51 +1,51 @@
>  /*
> -    comedi/drivers/amplc_pc236.c
> -    Driver for Amplicon PC36AT and PCI236 DIO boards.
> -
> -    Copyright (C) 2002 MEV Ltd. <http://www.mev.co.uk/>
> -
> -    COMEDI - Linux Control and Measurement Device Interface
> -    Copyright (C) 2000 David A. Schleef <ds@xxxxxxxxxxx>
> -
> -    This program is free software; you can redistribute it and/or modify
> -    it under the terms of the GNU General Public License as published by
> -    the Free Software Foundation; either version 2 of the License, or
> -    (at your option) any later version.
> -
> -    This program is distributed in the hope that it will be useful,
> -    but WITHOUT ANY WARRANTY; without even the implied warranty of
> -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -    GNU General Public License for more details.
> -*/
> + * comedi/drivers/amplc_pc236.c
> + * Driver for Amplicon PC36AT and PCI236 DIO boards.
> + *
> + * Copyright (C) 2002 MEV Ltd. <http://www.mev.co.uk/>
> + *
> + * COMEDI - Linux Control and Measurement Device Interface
> + * Copyright (C) 2000 David A. Schleef <ds@xxxxxxxxxxx>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
>  /*
> -Driver: amplc_pc236
> -Description: Amplicon PC36AT, PCI236
> -Author: Ian Abbott <abbotti@xxxxxxxxx>
> -Devices: [Amplicon] PC36AT (pc36at), PCI236 (pci236 or amplc_pc236)
> -Updated: Wed, 01 Apr 2009 15:41:25 +0100
> -Status: works
> -
> -Configuration options - PC36AT:
> -  [0] - I/O port base address
> -  [1] - IRQ (optional)
> -
> -Configuration options - PCI236:
> -  [0] - PCI bus of device (optional)
> -  [1] - PCI slot of device (optional)
> -  If bus/slot is not specified, the first available PCI device will be
> -  used.
> -
> -The PC36AT ISA board and PCI236 PCI board have a single 8255 appearing -as subdevice 0.
> -
> -Subdevice 1 pretends to be a digital input device, but it always returns
> -0 when read. However, if you run a command with scan_begin_src=TRIG_EXT, -a rising edge on port C bit 3 acts as an external trigger, which can be -used to wake up tasks.  This is like the comedi_parport device, but the -only way to physically disable the interrupt on the PC36AT is to remove -the IRQ jumper.  If no interrupt is connected, then subdevice 1 is -unused.
> -*/

Ian,

This patch appears to be corrupted.

> + * Driver: amplc_pc236
> + * Description: Amplicon PC36AT, PCI236
> + * Author: Ian Abbott <abbotti@xxxxxxxxx>
> + * Devices: [Amplicon] PC36AT (pc36at), PCI236 (pci236 or amplc_pc236)
> + * Updated: Wed, 01 Apr 2009 15:41:25 +0100
> + * Status: works
> + *
> + * Configuration options - PC36AT:
> + *   [0] - I/O port base address
> + *   [1] - IRQ (optional)
> + *
> + * Configuration options - PCI236:
> + *   [0] - PCI bus of device (optional)
> + *   [1] - PCI slot of device (optional)
> + *   If bus/slot is not specified, the first available PCI device will be
> + *   used.
> + *
> + * The PC36AT ISA board and PCI236 PCI board have a single 8255 
> + appearing

Patch corruption?

> + * as subdevice 0.
> + *
> + * Subdevice 1 pretends to be a digital input device, but it always 
> + returns

Again?

> + * 0 when read. However, if you run a command with 
> + scan_begin_src=TRIG_EXT,

Again?

> + * a rising edge on port C bit 3 acts as an external trigger, which can 
> + be

Again?
> + * used to wake up tasks.  This is like the comedi_parport device, but 
> + the

Again?

> + * only way to physically disable the interrupt on the PC36AT is to 
> + remove

Again?

> + * the IRQ jumper.  If no interrupt is connected, then subdevice 1 is
> + * unused.
> + */
>  
>  #include <linux/module.h>
>  #include <linux/pci.h>

Not sure what happened..

Hartley

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/