osdir.com
mailing list archive

Subject: [Kernel-janitors] [PATCH] eicon/s_4bri: replace schedule_timeout() with msleep() [corrected] - msg#00244

List: linux.kernel.janitors

Date: Prev Next Index Thread: Prev Next Index
I would appreciate any comments from the janitors list.

Thanks,
Nish



Applys-to: 2.6.7

Description: Replace diva_os_wait() with mdelay().

Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>


--- linux-vanilla/drivers/isdn/hardware/eicon/s_4bri.c 2004-06-16
05:18:37.000000000 +0000
+++ linux-dev/drivers/isdn/hardware/eicon/s_4bri.c 2004-07-02
18:10:53.000000000 +0000
@@ -104,13 +104,13 @@ static void reset_qBri_hardware (PISDN_A

qBriReset = (word volatile *)DIVA_OS_MEM_ATTACH_PROM(IoAdapter);
WRITE_WORD(qBriReset, READ_WORD(qBriReset) | PLX9054_SOFT_RESET) ;
- diva_os_wait (1) ;
+ mdelay (1) ;
WRITE_WORD(qBriReset, READ_WORD(qBriReset) & ~PLX9054_SOFT_RESET) ;
- diva_os_wait (1);
+ mdelay (1);
WRITE_WORD(qBriReset, READ_WORD(qBriReset) | PLX9054_RELOAD_EEPROM) ;
- diva_os_wait (1) ;
+ mdelay (1);
WRITE_WORD(qBriReset, READ_WORD(qBriReset) & ~PLX9054_RELOAD_EEPROM) ;
- diva_os_wait (1);
+ mdelay (1);
DIVA_OS_MEM_DETACH_PROM(IoAdapter, qBriReset);

qBriCntrl = DIVA_OS_MEM_ATTACH_CTLREG(IoAdapter);
@@ -132,9 +132,9 @@ void start_qBri_hardware (PISDN_ADAPTER
p = (byte volatile *)DIVA_OS_MEM_ATTACH_CTLREG(IoAdapter);
qBriReset = &p[(DIVA_4BRI_REVISION(IoAdapter)) ? (MQ2_BREG_RISC) :
(MQ_BREG_RISC)];
WRITE_DWORD(qBriReset, MQ_RISC_COLD_RESET_MASK) ;
- diva_os_wait (2) ;
+ mdelay (2) ;
WRITE_DWORD(qBriReset, MQ_RISC_WARM_RESET_MASK |
MQ_RISC_COLD_RESET_MASK) ;
- diva_os_wait (10) ;
+ mdelay (10) ;
DIVA_OS_MEM_DETACH_CTLREG(IoAdapter, p);

DBG_TRC(("started processor @ addr 0x%08lx", qBriReset))
@@ -316,7 +316,7 @@ int qBri_FPGA_download (PISDN_ADAPTER Io
*/
WRITE_WORD(addr, baseval & ~FPGA_PROG) ; /* PROGRAM low pulse */
WRITE_WORD(addr, baseval) ; /* release */
- diva_os_wait (50) ; /* wait until FPGA finished internal memory clear
*/
+ mdelay (50) ; /* wait until FPGA finished internal memory clear */
/*
* check done pin, must be low
*/
@@ -345,7 +345,7 @@ int qBri_FPGA_download (PISDN_ADAPTER Io
}
}
xdiFreeFile (File) ;
- diva_os_wait (100) ;
+ mdelay (100) ;
val = READ_WORD(addr) ;

DIVA_OS_MEM_DETACH_PROM(IoAdapter, addr);
@@ -837,7 +837,7 @@ static int load_qBri_hardware (PISDN_ADA
*/
for ( i = 0 ; i < 300 ; ++i )
{
- diva_os_wait (10) ;
+ mdelay (10) ;

if ( signature[0] == 0x4447 )
{
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@xxxxxxxxxxxxxx
http://lists.osdl.org/mailman/listinfo/kernel-janitors
Was this page helpful?
Yes No
Thread at a glance:

Previous Message by Date: click to view message preview

[Kernel-janitors] [PATCH] eicon/s_bri: replace schedule_timeout() with msleep() [corrected]

Please find the corrected patch below. I would appreciate any comments from the janitors list. Thanks, Nish Applys-to: 2.6.7 Description: Replace diva_os_wait() with msleep(). Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx> --- linux-vanilla/drivers/isdn/hardware/eicon/s_bri.c 2004-06-16 05:19:53.000000000 +0000 +++ linux-dev/drivers/isdn/hardware/eicon/s_bri.c 2004-07-02 18:11:16.000000000 +0000 @@ -367,7 +367,7 @@ static int load_bri_hardware (PISDN_ADAP addrHi = Port + ((IoAdapter->Properties.Bus==BUS_PCI) ? M_PCI_ADDRH : ADDRH); addrLo = Port + ADDR ; ioaddr = Port + DATA ; - diva_os_wait (100); + mdelay (100); /* * recover */ @@ -382,7 +382,7 @@ static int load_bri_hardware (PISDN_ADAP outppw (addrLo, 0) ; for ( i = 0 ; i < 0x8000 ; outppw (ioaddr, 0), ++i ) ; DIVA_OS_MEM_DETACH_PORT(IoAdapter, Port); - diva_os_wait (100) ; + mdelay (100) ; /* * download protocol and dsp files */ @@ -445,7 +445,7 @@ static int load_bri_hardware (PISDN_ADAP ioaddr = Port + DATA ; for ( i = 0 ; i < 300 ; ++i ) { - diva_os_wait (10) ; + mdelay (10) ; outpp (addrHi, (byte)((BRI_UNCACHED_ADDR (IoAdapter->MemoryBase + \ IoAdapter->MemorySize - BRI_SHARED_RAM_SIZE)) >> 16)) ; outppw (addrLo, 0x1e) ; _______________________________________________ Kernel-janitors mailing list Kernel-janitors@xxxxxxxxxxxxxx http://lists.osdl.org/mailman/listinfo/kernel-janitors

Next Message by Date: click to view message preview

[Kernel-janitors] [PATCH] eicon/s_pri: replace schedule_timeout() with msleep() [corrected]

Please find the corrected patch below and excuse my sending the same patch twice. I would appreciate any comments from the janitors list. Thanks, Nish Applys-to: 2.6.7 Description: Replace diva_os_wait() with mdelay(). Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx> --- linux-vanilla/drivers/isdn/hardware/eicon/s_pri.c 2004-06-16 05:20:26.000000000 +0000 +++ linux-dev/drivers/isdn/hardware/eicon/s_pri.c 2004-07-02 18:12:41.000000000 +0000 @@ -91,9 +91,9 @@ static void pri_cpu_trapped (PISDN_ADAPT static void reset_pri_hardware (PISDN_ADAPTER IoAdapter) { byte *p = DIVA_OS_MEM_ATTACH_RESET(IoAdapter); *p = _MP_RISC_RESET | _MP_LED1 | _MP_LED2 ; - diva_os_wait (50) ; + mdelay (50) ; *p = 0x00 ; - diva_os_wait (50) ; + mdelay (50) ; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); } /* ------------------------------------------------------------------------- @@ -110,14 +110,14 @@ static void stop_pri_hardware (PISDN_ADA i = 0 ; while ( (i < 100) && (IoAdapter->a.ram_in (&IoAdapter->a, &RAM->SWReg) != 0) ) { - diva_os_wait (1) ; + mdelay (1) ; i++ ; } DBG_TRC(("%s: PRI stopped (%d)", IoAdapter->Name, i)) cfgReg = (dword volatile *)DIVA_OS_MEM_ATTACH_CFG(IoAdapter); WRITE_DWORD(&cfgReg[0],((dword)(~0x03E00000))); DIVA_OS_MEM_DETACH_CFG(IoAdapter, cfgReg); - diva_os_wait (1) ; + mdelay (1) ; p = DIVA_OS_MEM_ATTACH_RESET(IoAdapter); *p = _MP_RISC_RESET | _MP_LED1 | _MP_LED2 ; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); @@ -264,7 +264,7 @@ diva_pri_detect_dsps (PISDN_ADAPTER IoAd } *(volatile byte*)(p) = _MP_RISC_RESET | _MP_DSP_RESET; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); - diva_os_wait (5) ; + mdelay (5) ; base = DIVA_OS_MEM_ATTACH_CONTROL(IoAdapter); @@ -286,7 +286,7 @@ diva_pri_detect_dsps (PISDN_ADAPTER IoAd p = DIVA_OS_MEM_ATTACH_RESET(IoAdapter); *(volatile byte*)(p) = _MP_RISC_RESET | _MP_LED1 | _MP_LED2; - diva_os_wait (50) ; + mdelay (50) ; /* Verify modules */ @@ -323,7 +323,7 @@ diva_pri_detect_dsps (PISDN_ADAPTER IoAd DBG_LOG(("DSP's(present-absent):%08x-%08x", ret, ~ret & 0x3fffffff)) *(volatile byte*)(p) = 0 ; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); - diva_os_wait (50) ; + mdelay (50) ; IoAdapter->InitialDspInfo |= DspCount << 16 ; return (ret); } @@ -421,9 +421,9 @@ static int load_pri_hardware (PISDN_ADAP /* * check if CPU is alive */ - diva_os_wait (10) ; + mdelay (10) ; i = boot->live ; - diva_os_wait (10) ; + mdelay (10) ; if ( i == boot->live ) { DIVA_OS_MEM_DETACH_RAM(IoAdapter, boot); @@ -467,7 +467,7 @@ static int load_pri_hardware (PISDN_ADAP */ for ( i = 0 ; i < 300 ; ++i ) { - diva_os_wait (10) ; + mdelay (10) ; if ( (boot->signature >> 16) == 0x4447 ) { DIVA_OS_MEM_DETACH_RAM(IoAdapter, boot); _______________________________________________ Kernel-janitors mailing list Kernel-janitors@xxxxxxxxxxxxxx http://lists.osdl.org/mailman/listinfo/kernel-janitors

Previous Message by Thread: click to view message preview

[Kernel-janitors] [PATCH] eicon/s_bri: replace schedule_timeout() with msleep() [corrected]

Please find the corrected patch below. I would appreciate any comments from the janitors list. Thanks, Nish Applys-to: 2.6.7 Description: Replace diva_os_wait() with msleep(). Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx> --- linux-vanilla/drivers/isdn/hardware/eicon/s_bri.c 2004-06-16 05:19:53.000000000 +0000 +++ linux-dev/drivers/isdn/hardware/eicon/s_bri.c 2004-07-02 18:11:16.000000000 +0000 @@ -367,7 +367,7 @@ static int load_bri_hardware (PISDN_ADAP addrHi = Port + ((IoAdapter->Properties.Bus==BUS_PCI) ? M_PCI_ADDRH : ADDRH); addrLo = Port + ADDR ; ioaddr = Port + DATA ; - diva_os_wait (100); + mdelay (100); /* * recover */ @@ -382,7 +382,7 @@ static int load_bri_hardware (PISDN_ADAP outppw (addrLo, 0) ; for ( i = 0 ; i < 0x8000 ; outppw (ioaddr, 0), ++i ) ; DIVA_OS_MEM_DETACH_PORT(IoAdapter, Port); - diva_os_wait (100) ; + mdelay (100) ; /* * download protocol and dsp files */ @@ -445,7 +445,7 @@ static int load_bri_hardware (PISDN_ADAP ioaddr = Port + DATA ; for ( i = 0 ; i < 300 ; ++i ) { - diva_os_wait (10) ; + mdelay (10) ; outpp (addrHi, (byte)((BRI_UNCACHED_ADDR (IoAdapter->MemoryBase + \ IoAdapter->MemorySize - BRI_SHARED_RAM_SIZE)) >> 16)) ; outppw (addrLo, 0x1e) ; _______________________________________________ Kernel-janitors mailing list Kernel-janitors@xxxxxxxxxxxxxx http://lists.osdl.org/mailman/listinfo/kernel-janitors

Next Message by Thread: click to view message preview

[Kernel-janitors] [PATCH] eicon/s_pri: replace schedule_timeout() with msleep() [corrected]

Please find the corrected patch below and excuse my sending the same patch twice. I would appreciate any comments from the janitors list. Thanks, Nish Applys-to: 2.6.7 Description: Replace diva_os_wait() with mdelay(). Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx> --- linux-vanilla/drivers/isdn/hardware/eicon/s_pri.c 2004-06-16 05:20:26.000000000 +0000 +++ linux-dev/drivers/isdn/hardware/eicon/s_pri.c 2004-07-02 18:12:41.000000000 +0000 @@ -91,9 +91,9 @@ static void pri_cpu_trapped (PISDN_ADAPT static void reset_pri_hardware (PISDN_ADAPTER IoAdapter) { byte *p = DIVA_OS_MEM_ATTACH_RESET(IoAdapter); *p = _MP_RISC_RESET | _MP_LED1 | _MP_LED2 ; - diva_os_wait (50) ; + mdelay (50) ; *p = 0x00 ; - diva_os_wait (50) ; + mdelay (50) ; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); } /* ------------------------------------------------------------------------- @@ -110,14 +110,14 @@ static void stop_pri_hardware (PISDN_ADA i = 0 ; while ( (i < 100) && (IoAdapter->a.ram_in (&IoAdapter->a, &RAM->SWReg) != 0) ) { - diva_os_wait (1) ; + mdelay (1) ; i++ ; } DBG_TRC(("%s: PRI stopped (%d)", IoAdapter->Name, i)) cfgReg = (dword volatile *)DIVA_OS_MEM_ATTACH_CFG(IoAdapter); WRITE_DWORD(&cfgReg[0],((dword)(~0x03E00000))); DIVA_OS_MEM_DETACH_CFG(IoAdapter, cfgReg); - diva_os_wait (1) ; + mdelay (1) ; p = DIVA_OS_MEM_ATTACH_RESET(IoAdapter); *p = _MP_RISC_RESET | _MP_LED1 | _MP_LED2 ; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); @@ -264,7 +264,7 @@ diva_pri_detect_dsps (PISDN_ADAPTER IoAd } *(volatile byte*)(p) = _MP_RISC_RESET | _MP_DSP_RESET; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); - diva_os_wait (5) ; + mdelay (5) ; base = DIVA_OS_MEM_ATTACH_CONTROL(IoAdapter); @@ -286,7 +286,7 @@ diva_pri_detect_dsps (PISDN_ADAPTER IoAd p = DIVA_OS_MEM_ATTACH_RESET(IoAdapter); *(volatile byte*)(p) = _MP_RISC_RESET | _MP_LED1 | _MP_LED2; - diva_os_wait (50) ; + mdelay (50) ; /* Verify modules */ @@ -323,7 +323,7 @@ diva_pri_detect_dsps (PISDN_ADAPTER IoAd DBG_LOG(("DSP's(present-absent):%08x-%08x", ret, ~ret & 0x3fffffff)) *(volatile byte*)(p) = 0 ; DIVA_OS_MEM_DETACH_RESET(IoAdapter, p); - diva_os_wait (50) ; + mdelay (50) ; IoAdapter->InitialDspInfo |= DspCount << 16 ; return (ret); } @@ -421,9 +421,9 @@ static int load_pri_hardware (PISDN_ADAP /* * check if CPU is alive */ - diva_os_wait (10) ; + mdelay (10) ; i = boot->live ; - diva_os_wait (10) ; + mdelay (10) ; if ( i == boot->live ) { DIVA_OS_MEM_DETACH_RAM(IoAdapter, boot); @@ -467,7 +467,7 @@ static int load_pri_hardware (PISDN_ADAP */ for ( i = 0 ; i < 300 ; ++i ) { - diva_os_wait (10) ; + mdelay (10) ; if ( (boot->signature >> 16) == 0x4447 ) { DIVA_OS_MEM_DETACH_RAM(IoAdapter, boot); _______________________________________________ Kernel-janitors mailing list Kernel-janitors@xxxxxxxxxxxxxx http://lists.osdl.org/mailman/listinfo/kernel-janitors
Sign up for updates to this mailing list. email:
Loading Comments...
Home | News | Patents | Sitemap | FAQ | advertise

Advertising by