Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e70a26 authored by Bernd Petrovitsch's avatar Bernd Petrovitsch Committed by Linus Torvalds
Browse files

[PATCH] Rename vprintk define in bttpvp.h 



Rename the (apparently) bttv intern #define vprintk to verbprintk to
resolve a name clash.

Reason: vprintk() is defined in include/linux/kernel.h similar to printk
but with a va_list argument.

(akpm: I changed it to bttv_printk)

Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f71626a4

drivers/media/video/bttv-driver.c

+7 −7
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static void set_pll(struct bttv *btv) 
                /* no PLL needed */

                if (btv->pll.pll_current == 0)

                        return;

		vprintk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",

		bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",

                           btv->c.nr,btv->pll.pll_ifreq);

                btwrite(0x00,BT848_TGCTRL);

                btwrite(0x00,BT848_PLL_XCI);
@@ -771,13 +771,13 @@ static void set_pll(struct bttv *btv) 
                return;

        }



	vprintk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,

	bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,

                   btv->pll.pll_ifreq, btv->pll.pll_ofreq);

	set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq);



        for (i=0; i<10; i++) {

		/*  Let other people run while the PLL stabilizes */

		vprintk(".");

		bttv_printk(".");

		msleep(10);



                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
@@ -785,12 +785,12 @@ static void set_pll(struct bttv *btv) 
                } else {

                        btwrite(0x08,BT848_TGCTRL);

                        btv->pll.pll_current = btv->pll.pll_ofreq;

			vprintk(" ok\n");

			bttv_printk(" ok\n");

                        return;

                }

        }

        btv->pll.pll_current = -1;

	vprintk("failed\n");

	bttv_printk("failed\n");

        return;

}

drivers/media/video/bttvp.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ 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);



#define vprintk  if (bttv_verbose) printk

#define bttv_printk if (bttv_verbose) printk

#define dprintk  if (bttv_debug >= 1) printk

#define d2printk if (bttv_debug >= 2) printk