Hi, The patch just removes all trailing whitespaces, there are no actual code changes. I've a script to remove them from my sources now, that should kill those no-op whitespace changes in my patches after merging this initial cleanup. Gerd Signed-off-by: Gerd Knorr --- Signed-off-by: Andrew Morton --- 25-akpm/drivers/media/video/video-buf.c | 32 ++++++++++++++++---------------- 25-akpm/include/media/video-buf.h | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff -puN drivers/media/video/video-buf.c~v4l-videobuf-whitespace-cleanup drivers/media/video/video-buf.c --- 25/drivers/media/video/video-buf.c~v4l-videobuf-whitespace-cleanup 2004-10-24 02:51:38.996368080 -0700 +++ 25-akpm/drivers/media/video/video-buf.c 2004-10-24 02:51:39.004366864 -0700 @@ -1,5 +1,5 @@ /* - * $Id: video-buf.c,v 1.12 2004/10/11 14:53:13 kraxel Exp $ + * $Id: video-buf.c,v 1.13 2004/10/13 10:39:00 kraxel Exp $ * * generic helper functions for video4linux capture buffers, to handle * memory management and PCI DMA. Right now bttv + saa7134 use it. @@ -9,7 +9,7 @@ * into PAGE_SIZE chunks). They also assume the driver does not need * to touch the video data (thus it is probably not useful for USB 1.1 * as data often must be uncompressed by the drivers). - * + * * (c) 2001-2004 Gerd Knorr [SUSE Labs] * * This program is free software; you can redistribute it and/or modify @@ -66,7 +66,7 @@ videobuf_vmalloc_to_sg(unsigned char *vi sglist[i].length = PAGE_SIZE; } return sglist; - + err: kfree(sglist); return NULL; @@ -193,7 +193,7 @@ int videobuf_dma_pci_map(struct pci_dev { MAGIC_CHECK(dma->magic,MAGIC_DMABUF); BUG_ON(0 == dma->nr_pages); - + if (dma->pages) { dma->sglist = videobuf_pages_to_sg(dma->pages, dma->nr_pages, dma->offset); @@ -289,7 +289,7 @@ int videobuf_waiton(struct videobuf_buff { int retval = 0; DECLARE_WAITQUEUE(wait, current); - + MAGIC_CHECK(vb->magic,MAGIC_BUFFER); add_wait_queue(&vb->done, &wait); while (vb->state == STATE_ACTIVE || vb->state == STATE_QUEUED) { @@ -355,7 +355,7 @@ videobuf_iolock(struct pci_dev *pci, str err = videobuf_dma_pci_map(pci,&vb->dma); if (0 != err) return err; - + return 0; } @@ -383,11 +383,11 @@ videobuf_queue_init(struct videobuf_queu INIT_LIST_HEAD(&q->stream); } -int +int videobuf_queue_is_busy(struct videobuf_queue *q) { int i; - + if (q->streaming) { dprintk(1,"busy: streaming active\n"); return 1; @@ -636,7 +636,7 @@ videobuf_qbuf(void *priv, struct videobu retval = q->ops->buf_prepare(priv,buf,field); if (0 != retval) goto done; - + list_add_tail(&buf->stream,&q->stream); if (q->streaming) { spin_lock_irqsave(q->irqlock,flags); @@ -644,7 +644,7 @@ videobuf_qbuf(void *priv, struct videobu spin_unlock_irqrestore(q->irqlock,flags); } retval = 0; - + done: up(&q->lock); return retval; @@ -656,7 +656,7 @@ videobuf_dqbuf(void *priv, struct videob { struct videobuf_buffer *buf; int retval; - + down(&q->lock); retval = -EBUSY; if (q->reading) @@ -697,7 +697,7 @@ int videobuf_streamon(void *priv, struct struct list_head *list; unsigned long flags; int retval; - + down(&q->lock); retval = -EBUSY; if (q->reading) @@ -756,7 +756,7 @@ videobuf_read_zerocopy(void *priv, struc retval = q->ops->buf_prepare(priv,q->read_buf,field); if (0 != retval) goto done; - + /* start capture & wait */ spin_lock_irqsave(q->irqlock,flags); q->ops->buf_queue(priv,q->read_buf); @@ -890,7 +890,7 @@ int videobuf_read_start(void *priv, stru void videobuf_read_stop(void *priv, struct videobuf_queue *q) { int i; - + videobuf_queue_cancel(priv,q); INIT_LIST_HEAD(&q->stream); for (i = 0; i < VIDEO_MAX_FRAME; i++) { @@ -910,7 +910,7 @@ ssize_t videobuf_read_stream(void *priv, unsigned int *fc, bytes; int err, retval; unsigned long flags; - + dprintk(2,"%s\n",__FUNCTION__); down(&q->lock); retval = -EBUSY; @@ -950,7 +950,7 @@ ssize_t videobuf_read_stream(void *priv, *fc = q->read_buf->field_count >> 1; dprintk(1,"vbihack: %d\n",*fc); } - + /* copy stuff */ bytes = count; if (bytes > q->read_buf->size - q->read_off) diff -puN include/media/video-buf.h~v4l-videobuf-whitespace-cleanup include/media/video-buf.h --- 25/include/media/video-buf.h~v4l-videobuf-whitespace-cleanup 2004-10-24 02:51:38.998367776 -0700 +++ 25-akpm/include/media/video-buf.h 2004-10-24 02:51:39.002367168 -0700 @@ -1,5 +1,5 @@ /* - * $Id: video-buf.h,v 1.7 2004/10/11 14:53:13 kraxel Exp $ + * $Id: video-buf.h,v 1.8 2004/10/13 10:39:00 kraxel Exp $ * * generic helper functions for video4linux capture buffers, to handle * memory management and PCI DMA. Right now bttv + saa7134 use it. @@ -9,7 +9,7 @@ * into PAGE_SIZE chunks). They also assume the driver does not need * to touch the video data (thus it is probably not useful for USB as * data often must be uncompressed by the drivers). - * + * * (c) 2001,02 Gerd Knorr * * This program is free software; you can redistribute it and/or modify @@ -102,7 +102,7 @@ int videobuf_dma_free(struct videobuf_dm * functions, additionally some commonly used fields for v4l buffers * (width, height, lists, waitqueue) are in there. That struct should * be used as first element in the drivers buffer struct. - * + * * about the mmap helpers (videobuf_mmap_*): * * The mmaper function allows to map any subset of contingous buffers. _