The patch titled
drivers/media/video/vivi.c: possible cleanups
has been added to the -mm tree. Its filename is
drivers-media-video-vivic-possible-cleanups.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Adrian Bunk <bunk@xxxxxxxxx>
- make needlessly global functions static
- remove unused #ifndef kzalloc kzalloc() #define
- remove inline's from functions
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/media/video/vivi.c | 44 +++++++++++++----------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff -puN drivers/media/video/vivi.c~drivers-media-video-vivic-possible-cleanups drivers/media/video/vivi.c
--- 25/drivers/media/video/vivi.c~drivers-media-video-vivic-possible-cleanups Thu Apr 27 16:04:07 2006
+++ 25-akpm/drivers/media/video/vivi.c Thu Apr 27 16:04:07 2006
@@ -48,16 +48,6 @@
#include "font.h"
-#ifndef kzalloc
-#define kzalloc(size, flags) \
-({ \
- void *__ret = kmalloc(size, flags); \
- if (__ret) \
- memset(__ret, 0, size); \
- __ret; \
-})
-#endif
-
MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");
MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
MODULE_LICENSE("Dual BSD/GPL");
@@ -248,7 +238,8 @@ static u8 bars[8][3] = {
#define TSTAMP_MAX_Y TSTAMP_MIN_Y+15
#define TSTAMP_MIN_X 64
-void prep_to_addr(struct sg_to_addr to_addr[],struct videobuf_buffer *vb)
+static void prep_to_addr(struct sg_to_addr to_addr[],
+ struct videobuf_buffer *vb)
{
int i, pos=0;
@@ -259,7 +250,7 @@ void prep_to_addr(struct sg_to_addr to_a
}
}
-inline int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
+static int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
{
int p1=0,p2=pages-1,p3=pages/2;
@@ -280,8 +271,8 @@ inline int get_addr_pos(int pos, int pag
return (p1);
}
-void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
- int hmax, int line, char *timestr)
+static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
+ int hmax, int line, char *timestr)
{
int w,i,j,pos=inipos,pgpos,oldpg,y;
char *p,*s,*basep;
@@ -491,7 +482,7 @@ static void vivi_thread_tick(struct vivi
dprintk(1,"%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
}
-void vivi_sleep(struct vivi_dmaqueue *dma_q)
+static void vivi_sleep(struct vivi_dmaqueue *dma_q)
{
int timeout;
DECLARE_WAITQUEUE(wait, current);
@@ -526,7 +517,7 @@ void vivi_sleep(struct vivi_dmaqueue *d
try_to_freeze();
}
-int vivi_thread(void *data)
+static int vivi_thread(void *data)
{
struct vivi_dmaqueue *dma_q=data;
@@ -542,7 +533,7 @@ int vivi_thread(void *data)
return 0;
}
-int vivi_start_thread(struct vivi_dmaqueue *dma_q)
+static int vivi_start_thread(struct vivi_dmaqueue *dma_q)
{
dma_q->frame=0;
dma_q->ini_jiffies=jiffies;
@@ -560,7 +551,7 @@ int vivi_start_thread(struct vivi_dmaque
return 0;
}
-void vivi_stop_thread(struct vivi_dmaqueue *dma_q)
+static void vivi_stop_thread(struct vivi_dmaqueue *dma_q)
{
dprintk(1,"%s\n",__FUNCTION__);
/* shutdown control thread */
@@ -666,8 +657,7 @@ buffer_setup(struct videobuf_queue *vq,
return 0;
}
-void
-free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
+static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
{
dprintk(1,"%s\n",__FUNCTION__);
@@ -791,8 +781,8 @@ static void buffer_release(struct videob
free_buffer(vq,buf);
}
-int vivi_map_sg (void *dev, struct scatterlist *sg, int nents,
- int direction)
+static int vivi_map_sg(void *dev, struct scatterlist *sg, int nents,
+ int direction)
{
int i;
@@ -808,15 +798,15 @@ int vivi_map_sg (void *dev, struct scatt
return nents;
}
-int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,
- int direction)
+static int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,
+ int direction)
{
dprintk(1,"%s\n",__FUNCTION__);
return 0;
}
-int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist,int nr_pages,
- int direction)
+static int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist, int nr_pages,
+ int direction)
{
// dprintk(1,"%s\n",__FUNCTION__);
@@ -900,7 +890,7 @@ static int res_get(struct vivi_dev *dev,
return 1;
}
-static inline int res_locked(struct vivi_dev *dev)
+static int res_locked(struct vivi_dev *dev)
{
return (dev->resources);
}
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
fix-array-overrun-in-drivers-char-mwave-mwaveddc.patch
readd-the-oss-sound_cs4232-option.patch
mark-vmsplit-embedded.patch
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
git-dvb.patch
fix-video_dev=m-video_v4l1_compat=y.patch
drivers-media-video-vivic-possible-cleanups.patch
avermedia-6-eyes-avs6eyes-support.patch
gregkh-i2c-w1-cleanups-fix.patch
git-gfs2.patch
git-infiniband.patch
git-intelfb.patch
fs-nfs-inodec-make-nfs_follow_referral.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
git-scsi-rc-fixes.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
ieee80211_wxc-remove-dead-code.patch
swsusp-rework-memory-shrinker-rev-2-fix.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
time-i386-clocksource-drivers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
