You can import this changeset into BK by piping this whole message to: '| bk receive [path to repository]' or apply the patch as usual. =================================================================== ChangeSet@1.856, 2002-12-07 15:25:11-02:00, acme@conectiva.com.br o dvb/saa7146_core: use pci_[gs]et_drvdata instead of pdev->driver_data Fixes build, also move some zero initialized globals to .bss saa7146_core.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff -Nru a/drivers/media/dvb/av7110/saa7146_core.c b/drivers/media/dvb/av7110/saa7146_core.c --- a/drivers/media/dvb/av7110/saa7146_core.c Sat Dec 7 15:57:14 2002 +++ b/drivers/media/dvb/av7110/saa7146_core.c Sat Dec 7 15:57:14 2002 @@ -45,14 +45,14 @@ /* insmod parameter: some programs (e.g. īvicī) do not allow to specify the used video-mode, so you have to tell this to the - modules by hand, 0 = PAL, 1 = NTSC */ -static int mode = 0; + modules by hand, 0 = PAL (default), 1 = NTSC */ +static int mode; -/* debug levels: 0 -- no debugging outputs +/* debug levels: 0 -- no debugging outputs: default 1 -- prints out entering (and exiting if useful) of functions 2 -- prints out very, very detailed informations of what is going on 3 -- both of the above */ -int saa7146_debug = 0; /* insmod parameter */ +int saa7146_debug; /* insmod parameter */ #define dprintk if (saa7146_debug & 1) printk #define hprintk if (saa7146_debug & 2) printk @@ -796,7 +796,7 @@ static int saa7146_suspend(struct pci_dev *pdev, u32 state) { printk("saa7146_suspend()\n"); - saa7146_core_command(((struct saa7146 *) pdev->driver_data)->i2c_bus, + saa7146_core_command(((struct saa7146 *)pci_get_drvdata(pdev))->i2c_bus, SAA7146_SUSPEND, 0); return 0; } @@ -805,7 +805,7 @@ saa7146_resume(struct pci_dev *pdev) { printk("saa7146_resume()\n"); - saa7146_core_command(((struct saa7146 *) pdev->driver_data)->i2c_bus, + saa7146_core_command(((struct saa7146 *)pci_get_drvdata(pdev))->i2c_bus, SAA7146_RESUME, 0); return 0; } @@ -839,7 +839,7 @@ memset (saa, 0, sizeof (struct saa7146)); saa->device = pdev; - saa->device->driver_data = saa; + pci_set_drvdata(pdev, saa); saa->card_type = card_type; saa->dvb_adapter = adap; @@ -855,7 +855,7 @@ static void __devexit saa7146_remove_one (struct pci_dev *pdev) { - struct saa7146 *saa = pdev->driver_data; + struct saa7146 *saa = pci_get_drvdata(pdev); dprintk("saa7146_remove_one()\n"); =================================================================== This BitKeeper patch contains the following changesets: 1.856 ## Wrapped with gzip_uu ## begin 664 bkpatch15853 M'XL(`'HV\CT``]U56V_3,!1^KG_%D7AIQY+8;M)XQ0VJ"8$"/%`;-F6C\]W+M\YR@-X:U2;C411*_(`GFMCLU&A M&U78LA=^H6L_;U%PK34*@HVN5?#X,JA+4WCO7WQZ)J0^1S.-Z)9J]?*PGQ.K&Y[44ES)NRFTHUO6]&86MG!Z.[V MZ8Y3RG%$+)[2:+9C,QK&NX))QD3(E*0\3&8AQ"GK*( M+(#Y230#R@/&`QH#BS(>98QYE&>4PKV@\)"!1\EC^+L!G),"-,@^#XP0,0MG MRT*W*H/.*-@6Y?+=VKQ7=BG;7@HKH&R,54*"7L%6JMX[E6V)%"R=$)%P/BT_ M*@-Y5U;R&$1E--2Z5V"00?BL6HT0I2U%57Y6$M:5SO$-Q@1^;@RYA)!S-B-7 M=YP1[S<_0JB@Y!1MB^:L^JC;=7?C=S==Y^,1#^^^)?#];N^\"6HE2Q&X)(@^ M9HS^D`N_V+-(><)YF%*^H]-9'.]8GJQD2%=AE"K!97X_;;]G8Z@4'F&E1%,V M8T/U_B*`J^U_'3(1&R&P$,NV%F7E-\K^J257J2%+7>`T3?G0(N%A@]#XYPV2 M@)?\]PVR+XQ7X+4?AHD%?_6K-?('O;0($^#D(DQQ!4!795WG4715WS4CP9]MSK4;Q$.*BKP2/IS%/R1=+S.FRH@<````` ` end