From: Adrian Bunk <bunk@stusta.de>
To: Gerd Knorr <kraxel@bytesex.org>
Cc: video4linux-list@redhat.com, linux-kernel@vger.kernel.org
Subject: [11/11] misc bttv statification
Date: Tue, 9 Nov 2004 02:07:25 +0100 [thread overview]
Message-ID: <20041109010725.GZ15077@stusta.de> (raw)
In-Reply-To: <20041109004341.GO15077@stusta.de>
The patch below makes some bttv code static.
It could be splitted into three patches, but has overlapping context
(and isn't too big altogether).
diffstat output:
drivers/media/video/bttv-cards.c | 7 ++++---
drivers/media/video/bttv-driver.c | 6 +++---
drivers/media/video/bttvp.h | 5 -----
3 files changed, 7 insertions(+), 11 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc1-mm3-full/drivers/media/video/bttvp.h.old 2004-11-07 16:34:44.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/media/video/bttvp.h 2004-11-07 16:47:42.000000000 +0100
@@ -240,11 +221,6 @@
extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
extern int init_bttv_i2c(struct bttv *btv);
extern int fini_bttv_i2c(struct bttv *btv);
-extern int pvr_boot(struct bttv *btv);
-
-extern int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg);
-extern void bttv_reinit_bt848(struct bttv *btv);
-extern void bttv_field_count(struct bttv *btv);
#define vprintk if (bttv_verbose) printk
#define dprintk if (bttv_debug >= 1) printk
--- linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-cards.c.old 2004-11-07 16:34:59.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-cards.c 2004-11-07 17:14:25.000000000 +0100
@@ -84,12 +84,13 @@
static int tea5757_write(struct bttv *btv, int value);
static void identify_by_eeprom(struct bttv *btv,
unsigned char eeprom_data[256]);
+static int __devinit pvr_boot(struct bttv *btv);
/* config variables */
static unsigned int triton1=0;
static unsigned int vsfx=0;
static unsigned int latency = UNSET;
-unsigned int no_overlay=-1;
+static unsigned int no_overlay=-1;
static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
@@ -2979,7 +2959,7 @@
extern int mod_firmware_load(const char *fn, char **fp);
-int __devinit pvr_boot(struct bttv *btv)
+static int __devinit pvr_boot(struct bttv *btv)
{
u32 microlen;
u8 *micro;
@@ -3003,7 +2983,7 @@
#else
/* new 2.5.x way -- via hotplug firmware loader */
-int __devinit pvr_boot(struct bttv *btv)
+static int __devinit pvr_boot(struct bttv *btv)
{
const struct firmware *fw_entry;
int rc;
--- linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-driver.c.old 2004-11-07 16:40:15.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-driver.c 2004-11-07 16:41:55.000000000 +0100
@@ -1071,7 +1071,7 @@
init_irqreg(btv);
}
-void bttv_reinit_bt848(struct bttv *btv)
+static void bttv_reinit_bt848(struct bttv *btv)
{
unsigned long flags;
@@ -1275,7 +1275,7 @@
btv->c.nr,outbits,data & outbits, data & ~outbits, comment);
}
-void bttv_field_count(struct bttv *btv)
+static void bttv_field_count(struct bttv *btv)
{
int need_count = 0;
@@ -1475,7 +1475,7 @@
"SMICROCODE", "GVBIFMT", "SVBIFMT" };
#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
-int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
+static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
{
switch (cmd) {
case BTTV_VERSION:
next prev parent reply other threads:[~2004-11-09 1:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-07 17:50 RFC: [2.6 patch] drivers/media/video/ cleanups Adrian Bunk
2004-11-08 11:40 ` Gerd Knorr
2004-11-09 0:43 ` Adrian Bunk
2004-11-09 0:50 ` [1/11] drivers/media/video: the easy cleanups Adrian Bunk
2004-11-09 0:51 ` [2/11] media/video/msp3400.c: remove unused struct d1 Adrian Bunk
2004-11-09 0:53 ` [3/11] zoran_driver.c: make zoran_num_formats static Adrian Bunk
2004-11-09 0:55 ` [4/11] bttv-cards.c: remove unused function bttv_reset_audio Adrian Bunk
2004-11-09 0:57 ` [5/11] bttv-risc.c: make some functions static Adrian Bunk
2004-11-09 0:59 ` [6/11] v4l2-common.c: remove v4l2_video_std_fps Adrian Bunk
2004-11-09 1:00 ` [7/11] bttv-driver.c: make some variables static Adrian Bunk
2004-11-09 1:02 ` [8/11] saa7134-core.c: make saa7134_devcount static Adrian Bunk
2004-11-09 1:03 ` [9/11] bttv-i2c.c: make two functions static Adrian Bunk
2004-11-09 1:05 ` [10/11] zoran_device.c: make zr36057_init_vfe static Adrian Bunk
2004-11-09 1:07 ` Adrian Bunk [this message]
2004-11-09 9:46 ` RFC: [2.6 patch] drivers/media/video/ cleanups Gerd Knorr
2004-11-10 2:32 ` [2.6 patch] #if 0 cx88_risc_disasm Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041109010725.GZ15077@stusta.de \
--to=bunk@stusta.de \
--cc=kraxel@bytesex.org \
--cc=linux-kernel@vger.kernel.org \
--cc=video4linux-list@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox