On Thu, 22 Jun 2006 16:16:04 -0700 mark gross wrote:
a. still has 6 lines of trailing whitespace.
> diff -urN -X linux-2.6.17.1/Documentation/dontdiff ../linux-2.6.17.1/drivers/char/riport.c linux-2.6.17.1/drivers/char/riport.c
> --- ../linux-2.6.17.1/drivers/char/riport.c 1969-12-31 16:00:00.000000000 -0800
> +++ linux-2.6.17.1/drivers/char/riport.c 2006-06-22 16:07:34.000000000 -0700
> +static struct devriport __init *devriport_init(int major, int minor, unsigned int io, int irq,
> + int dma, int size, int *presult)
> +{
> + struct devriport *this;
> +
> + *presult = 0;
> + this = kzalloc(sizeof(struct devriport), GFP_KERNEL);
> + if (!this) {
> + *presult = -ENOMEM;
> + goto fail_memory;
> + }
> +
> + if (!request_region(io, 3, "riport")) {
> + PDEBUG("request_region 0x%X of 3 bytes fails\n", io);
> + *presult = -EBUSY;
> + goto fail_io;
> + }
> + if (!request_region(io + ECP_OFFSET, 3, "riport")) {
> + release_region(io,3);
> +
> + PDEBUG("request_region 0x%X of 3 bytes fails\n", io + ECP_OFFSET );
> + *presult = -EBUSY;
> + goto fail_io;
> + }
> + this->pinode = NULL;
> + this->pfile = NULL;
> + this->usage = 0;
> + this->syncWord = 0;
> + this->bytestoread = 0;
> + this->numbytesthisstate = 0;
> + this->irqinuse = 0;
Since kzalloc() is now being used, above lines aren't needed.
> + switch (this->readstate) {
> + /* due to the magic of the ECP port, it seems that we are
> + guaranteed to be fed a header from the riegl whenever we call
> + riport_open. this code assumes that is true */
For multi-line comments (multiple places), regular kernel
coding style is:
/*
* due to blah blah ...
* end
*/
> +static int devriport_open(struct devriport *this)
> +{
> + result =
> + request_irq(this->irq, devriport_irq_wrap, SA_INTERRUPT,
> + "riport", this);
Put that on 2 lines.
> +static int __init riport_init(void)
> +{
> + pdev =
> + devriport_init(riport.major, riport.numdevs, io, irq, dma, size,
> + &result);
Put on 2 lines.
> +}
> +
> +module_param(io, int, 0444);
> +MODULE_PARM_DESC(io, "if non-zero then overrides IO port address");
> +
> +module_param(irq, int, 0444);
> +MODULE_PARM_DESC(io, "if non-zero then overrides IRQ number");
irq
> +
> +module_param(size, int, 0444);
> +MODULE_PARM_DESC(io, "if non-zero then overrides buffer size");
size
---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
