| |||||||||||||
[PATCH] sparse: misc NULL noise in drivers/*
ChangeSet 1.1850, 2004/07/12 09:08:39-07:00, viro@www.linux.org.uk
[PATCH] sparse: misc NULL noise in drivers/*
acpi/toshiba_acpi.c | 10 +++++-----
atm/ambassador.c | 4 ++--
atm/firestream.c | 2 +-
atm/he.c | 2 +-
atm/horizon.c | 14 +++++++-------
atm/idt77252.c | 2 +-
atm/iphase.c | 2 +-
atm/lanai.c | 2 +-
block/cryptoloop.c | 8 ++++----
block/paride/paride.c | 2 +-
block/paride/pcd.c | 2 +-
block/paride/pf.c | 4 ++--
block/xd.c | 22 +++++++++++-----------
char/mwave/mwavedd.c | 8 ++++----
char/mwave/tp3780i.c | 8 ++++----
char/pcmcia/synclink_cs.c | 8 ++++----
char/rocket.c | 8 ++++----
char/rtc.c | 2 +-
ide/legacy/ide-cs.c | 2 +-
ide/pci/siimage.c | 2 +-
input/joystick/grip.c | 4 ++--
input/joystick/grip_mp.c | 4 ++--
md/kcopyd.c | 2 +-
media/radio/miropcm20-radio.c | 2 +-
media/video/bttv-cards.c | 2 +-
media/video/bw-qcam.c | 2 +-
media/video/cpia.c | 6 +++---
media/video/dpc7146.c | 2 +-
media/video/hexium_orion.c | 2 +-
media/video/meye.c | 4 ++--
media/video/mxb.c | 2 +-
media/video/tea6415c.c | 2 +-
media/video/videocodec.c | 4 ++--
media/video/zoran_driver.c | 10 ++++------
media/video/zoran_procfs.c | 4 ++--
message/fusion/mptscsih.c | 2 +-
message/i2o/i2o_config.c | 2 +-
message/i2o/i2o_proc.c | 4 ++--
net/appletalk/ltpc.c | 4 ++--
net/irda/irtty-sir.c | 2 +-
net/irda/vlsi_ir.c | 6 +++---
net/pcmcia/smc91c92_cs.c | 2 +-
net/pcmcia/xirc2ps_cs.c | 2 +-
net/tokenring/ibmtr.c | 2 +-
net/wan/cosa.c | 10 +++++-----
45 files changed, 100 insertions(+), 102 deletions(-)
diff -Nru a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
--- a/drivers/acpi/toshiba_acpi.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/acpi/toshiba_acpi.c 2004-07-12 11:11:41 -07:00
@@ -115,7 +115,7 @@
acpi_handle handle;
acpi_status status;
- status = acpi_get_handle(0, (char*)methodName, &handle);
+ status = acpi_get_handle(NULL, (char*)methodName, &handle);
return !ACPI_FAILURE(status);
}
@@ -131,7 +131,7 @@
in_objs[0].type = ACPI_TYPE_INTEGER;
in_objs[0].integer.value = val;
- status = acpi_evaluate_object(0, (char*)methodName, ¶ms, 0);
+ status = acpi_evaluate_object(NULL, (char*)methodName, ¶ms, NULL);
return (status == AE_OK);
}
@@ -178,7 +178,7 @@
results.length = sizeof(out_objs);
results.pointer = out_objs;
- status = acpi_evaluate_object(0, (char*)method_hci, ¶ms,
+ status = acpi_evaluate_object(NULL, (char*)method_hci, ¶ms,
&results);
if ((status == AE_OK) && (out_objs->package.count <= HCI_WORDS)) {
for (i = 0; i < out_objs->package.count; ++i) {
@@ -487,8 +487,8 @@
{ "video" , read_video , write_video },
{ "fan" , read_fan , write_fan },
{ "keys" , read_keys , write_keys },
- { "version" , read_version , 0 },
- { 0 , 0 , 0 },
+ { "version" , read_version , NULL },
+ { NULL }
};
static acpi_status __init
diff -Nru a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
--- a/drivers/atm/ambassador.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/ambassador.c 2004-07-12 11:11:41 -07:00
@@ -1126,7 +1126,7 @@
} else {
r = round_up;
}
- error = make_rate (pcr, r, &tx_rate_bits, 0);
+ error = make_rate (pcr, r, &tx_rate_bits, NULL);
tx_vc_bits = TX_UBR_CAPPED;
tx_frame_bits = TX_FRAME_CAPPED;
}
@@ -1333,7 +1333,7 @@
PRINTK (KERN_ERR, "%s vcc=%p rxer[vci]=%p",
"arghhh! we're going to die!",
vcc, dev->rxer[vci]);
- dev->rxer[vci] = 0;
+ dev->rxer[vci] = NULL;
while (command_do (dev, &cmd))
schedule();
diff -Nru a/drivers/atm/firestream.c b/drivers/atm/firestream.c
--- a/drivers/atm/firestream.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/firestream.c 2004-07-12 11:11:41 -07:00
@@ -1000,7 +1000,7 @@
} else {
r = ROUND_UP;
}
- error = make_rate (pcr, r, &tmc0, 0);
+ error = make_rate (pcr, r, &tmc0, NULL);
}
fs_dprintk (FS_DEBUG_OPEN, "pcr = %d.\n", pcr);
}
diff -Nru a/drivers/atm/he.c b/drivers/atm/he.c
--- a/drivers/atm/he.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/he.c 2004-07-12 11:11:41 -07:00
@@ -360,7 +360,7 @@
goto init_one_failure;
}
- atm_dev = atm_dev_register(DEV_LABEL, &he_ops, -1, 0);
+ atm_dev = atm_dev_register(DEV_LABEL, &he_ops, -1, NULL);
if (!atm_dev) {
err = -ENODEV;
goto init_one_failure;
diff -Nru a/drivers/atm/horizon.c b/drivers/atm/horizon.c
--- a/drivers/atm/horizon.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/horizon.c 2004-07-12 11:11:41 -07:00
@@ -1184,7 +1184,7 @@
// tx_regions == 0
// that's all folks - end of frame
struct sk_buff * skb = dev->tx_skb;
- dev->tx_iovec = 0;
+ dev->tx_iovec = NULL;
// VC layer stats
atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
@@ -1761,7 +1761,7 @@
if (tx_iovcnt) {
// scatter gather transfer
dev->tx_regions = tx_iovcnt;
- dev->tx_iovec = 0; /* @@@ needs rewritten */
+ dev->tx_iovec = NULL; /* @@@ needs rewritten */
dev->tx_bytes = 0;
PRINTD (DBG_TX|DBG_BUS, "TX start scatter-gather transfer (iovec %p, len %d)",
skb->data, tx_len);
@@ -1771,7 +1771,7 @@
} else {
// simple transfer
dev->tx_regions = 0;
- dev->tx_iovec = 0;
+ dev->tx_iovec = NULL;
dev->tx_bytes = tx_len;
dev->tx_addr = skb->data;
PRINTD (DBG_TX|DBG_BUS, "TX start simple transfer (addr %p, len %d)",
@@ -2278,7 +2278,7 @@
// we take "the PCR" as a rate-cap
// not reserved
vcc.tx_rate = 0;
- make_rate (dev, 1<<30, round_nearest, &vcc.tx_pcr_bits, 0);
+ make_rate (dev, 1<<30, round_nearest, &vcc.tx_pcr_bits, NULL);
vcc.tx_xbr_bits = ABR_RATE_TYPE;
break;
}
@@ -2583,7 +2583,7 @@
PRINTK (KERN_ERR, "%s atm_vcc=%p rxer[channel]=%p",
"arghhh! we're going to die!",
atm_vcc, dev->rxer[channel]);
- dev->rxer[channel] = 0;
+ dev->rxer[channel] = NULL;
}
// atomically release our rate reservation
@@ -2806,8 +2806,8 @@
dev->tx_regions = 0;
dev->tx_bytes = 0;
- dev->tx_skb = 0;
- dev->tx_iovec = 0;
+ dev->tx_skb = NULL;
+ dev->tx_iovec = NULL;
dev->tx_cell_count = 0;
dev->rx_cell_count = 0;
diff -Nru a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
--- a/drivers/atm/idt77252.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/idt77252.c 2004-07-12 11:11:41 -07:00
@@ -3729,7 +3729,7 @@
return -EIO;
}
- dev = atm_dev_register("idt77252", &idt77252_ops, -1, 0);
+ dev = atm_dev_register("idt77252", &idt77252_ops, -1, NULL);
if (!dev) {
printk("%s: can't register atm device\n", card->name);
iounmap((void *) card->membase);
diff -Nru a/drivers/atm/iphase.c b/drivers/atm/iphase.c
--- a/drivers/atm/iphase.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/iphase.c 2004-07-12 11:11:41 -07:00
@@ -2667,7 +2667,7 @@
}
// Drain the packets
rx_dle_intr(vcc->dev);
- iadev->rx_open[vcc->vci] = 0;
+ iadev->rx_open[vcc->vci] = NULL;
}
kfree(INPH_IA_VCC(vcc));
ia_vcc = NULL;
diff -Nru a/drivers/atm/lanai.c b/drivers/atm/lanai.c
--- a/drivers/atm/lanai.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/atm/lanai.c 2004-07-12 11:11:41 -07:00
@@ -2702,7 +2702,7 @@
return -ENOMEM;
}
- atmdev = atm_dev_register(DEV_LABEL, &ops, -1, 0);
+ atmdev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
if (atmdev == NULL) {
printk(KERN_ERR DEV_LABEL
": couldn't register atm device!\n");
diff -Nru a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
--- a/drivers/block/cryptoloop.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/block/cryptoloop.c 2004-07-12 11:11:41 -07:00
@@ -93,8 +93,8 @@
int size, sector_t IV)
{
struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
- struct scatterlist sg_out = { 0, };
- struct scatterlist sg_in = { 0, };
+ struct scatterlist sg_out = { NULL, };
+ struct scatterlist sg_in = { NULL, };
encdec_ecb_t encdecfunc;
struct page *in_page, *out_page;
@@ -147,8 +147,8 @@
int size, sector_t IV)
{
struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
- struct scatterlist sg_out = { 0, };
- struct scatterlist sg_in = { 0, };
+ struct scatterlist sg_out = { NULL, };
+ struct scatterlist sg_in = { NULL, };
encdec_cbc_t encdecfunc;
struct page *in_page, *out_page;
diff -Nru a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
--- a/drivers/block/paride/paride.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/block/paride/paride.c 2004-07-12 11:11:41 -07:00
@@ -264,7 +264,7 @@
printk("paride: %s not registered\n", pr->name);
return;
}
- protocols[pr->index] = 0;
+ protocols[pr->index] = NULL;
}
EXPORT_SYMBOL(pi_unregister);
diff -Nru a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
--- a/drivers/block/paride/pcd.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/block/paride/pcd.c 2004-07-12 11:11:41 -07:00
@@ -752,7 +752,7 @@
pcd_count = pcd_req->current_nr_sectors;
pcd_buf = pcd_req->buffer;
pcd_busy = 1;
- ps_set_intr(do_pcd_read, 0, 0, nice);
+ ps_set_intr(do_pcd_read, NULL, 0, nice);
return;
} else
end_request(pcd_req, 0);
diff -Nru a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
--- a/drivers/block/paride/pf.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/block/paride/pf.c 2004-07-12 11:11:41 -07:00
@@ -841,7 +841,7 @@
/* detach from the calling context - in case the spinlock is held */
static void do_pf_read(void)
{
- ps_set_intr(do_pf_read_start, 0, 0, nice);
+ ps_set_intr(do_pf_read_start, NULL, 0, nice);
}
static void do_pf_read_start(void)
@@ -887,7 +887,7 @@
static void do_pf_write(void)
{
- ps_set_intr(do_pf_write_start, 0, 0, nice);
+ ps_set_intr(do_pf_write_start, NULL, 0, nice);
}
static void do_pf_write_start(void)
diff -Nru a/drivers/block/xd.c b/drivers/block/xd.c
--- a/drivers/block/xd.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/block/xd.c 2004-07-12 11:11:41 -07:00
@@ -96,7 +96,7 @@
#include <asm/page.h>
#define xd_dma_mem_alloc(size) __get_dma_pages(GFP_KERNEL,get_order(size))
#define xd_dma_mem_free(addr, size) free_pages(addr, get_order(size))
-static char *xd_dma_buffer = 0;
+static char *xd_dma_buffer;
static XD_SIGNATURE xd_sigs[] __initdata = {
{ 0x0000,"Override geometry handler",NULL,xd_override_init_drive,"n unknown" }, /* Pat Mackinlay, pat@it.com.au */
@@ -344,7 +344,7 @@
if (nodma && xd_dma_buffer) {
xd_dma_mem_free((unsigned long)xd_dma_buffer,
xd_maxsectors * 0x200);
- xd_dma_buffer = 0;
+ xd_dma_buffer = NULL;
} else if (!nodma && !xd_dma_buffer) {
xd_dma_buffer = (char *)xd_dma_mem_alloc(xd_maxsectors * 0x200);
if (!xd_dma_buffer) {
@@ -448,7 +448,7 @@
u_char cmdblk[6];
xd_build(cmdblk,CMD_RECALIBRATE,drive,0,0,0,0,0);
- if (xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 8))
+ if (xd_command(cmdblk,PIO_MODE,NULL,NULL,NULL,XD_TIMEOUT * 8))
printk("xd%c: warning! error recalibrating, controller may be unstable\n", 'a'+drive);
}
@@ -607,7 +607,7 @@
if (csb & CSB_ERROR) { /* read sense data if error */
xd_build(cmdblk,CMD_SENSE,(csb & CSB_LUN) >> 5,0,0,0,0,0);
- if (xd_command(cmdblk,0,sense,0,0,XD_TIMEOUT))
+ if (xd_command(cmdblk,0,sense,NULL,NULL,XD_TIMEOUT))
printk("xd: warning! sense command failed!\n");
}
@@ -624,7 +624,7 @@
for (i = 0; i < XD_MAXDRIVES; i++) {
xd_build(cmdblk,CMD_TESTREADY,i,0,0,0,0,0);
- if (!xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 8)) {
+ if (!xd_command(cmdblk,PIO_MODE,NULL,NULL,NULL,XD_TIMEOUT*8)) {
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(XD_INIT_DISK_DELAY);
@@ -714,7 +714,7 @@
u_char cmdblk[6],buf[64];
xd_build(cmdblk,CMD_DTCGETGEOM,drive,0,0,0,0,0);
- if (!xd_command(cmdblk,PIO_MODE,buf,0,0,XD_TIMEOUT * 2)) {
+ if (!xd_command(cmdblk,PIO_MODE,buf,NULL,NULL,XD_TIMEOUT * 2)) {
xd_info[drive].heads = buf[0x0A]; /* heads */
xd_info[drive].cylinders = ((u_short *) (buf))[0x04]; /* cylinders */
xd_info[drive].sectors = 17; /* sectors */
@@ -729,7 +729,7 @@
xd_setparam(CMD_DTCSETPARAM,drive,xd_info[drive].heads,xd_info[drive].cylinders,((u_short *) (buf + 1))[0x05],((u_short *) (buf + 1))[0x06],buf[0x0F]);
xd_build(cmdblk,CMD_DTCSETSTEP,drive,0,0,0,0,7);
- if (xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 2))
+ if (xd_command(cmdblk,PIO_MODE,NULL,NULL,NULL,XD_TIMEOUT * 2))
printk("xd_dtc_init_drive: error setting step rate for xd%c\n", 'a'+drive);
}
else
@@ -785,7 +785,7 @@
xd_irq = 9;
rll = (jumper_state & 0x30) ? (0x04 << wd_1002) : 0;
xd_build(cmdblk,CMD_READ,drive,0,0,0,1,0);
- if (!xd_command(cmdblk,PIO_MODE,buf,0,0,XD_TIMEOUT * 2)) {
+ if (!xd_command(cmdblk,PIO_MODE,buf,NULL,NULL,XD_TIMEOUT * 2)) {
xd_info[drive].heads = buf[0x1AF]; /* heads */
xd_info[drive].cylinders = ((u_short *) (buf + 1))[0xD6]; /* cylinders */
xd_info[drive].sectors = 17; /* sectors */
@@ -862,7 +862,7 @@
u_char cmdblk[6],buf[0x200];
xd_build(cmdblk,CMD_ST11GETGEOM,drive,0,0,0,1,0);
- if (!xd_command(cmdblk,PIO_MODE,buf,0,0,XD_TIMEOUT * 2)) {
+ if (!xd_command(cmdblk,PIO_MODE,buf,NULL,NULL,XD_TIMEOUT * 2)) {
xd_info[drive].heads = buf[0x04]; /* heads */
xd_info[drive].cylinders = (buf[0x02] << 8) | buf[0x03]; /* cylinders */
xd_info[drive].sectors = buf[0x05]; /* sectors */
@@ -987,7 +987,7 @@
while (min[i] != max[i] - 1) {
test[i] = (min[i] + max[i]) / 2;
xd_build(cmdblk,CMD_SEEK,drive,(u_char) test[0],(u_short) test[1],(u_char) test[2],0,0);
- if (!xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 2))
+ if (!xd_command(cmdblk,PIO_MODE,NULL,NULL,NULL,XD_TIMEOUT * 2))
min[i] = test[i];
else
max[i] = test[i];
@@ -1039,7 +1039,7 @@
/* Some controllers require geometry info as data, not command */
- if (xd_command(cmdblk,PIO_MODE,0,&cmdblk[6],0,XD_TIMEOUT * 2))
+ if (xd_command(cmdblk,PIO_MODE,NULL,&cmdblk[6],NULL,XD_TIMEOUT * 2))
printk("xd: error setting characteristics for xd%c\n", 'a'+drive);
}
diff -Nru a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
--- a/drivers/char/mwave/mwavedd.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/char/mwave/mwavedd.c 2004-07-12 11:11:41 -07:00
@@ -179,7 +179,7 @@
case IOCTL_MW_READ_DATA:
case IOCTL_MW_READCLEAR_DATA: {
MW_READWRITE rReadData;
- unsigned short __user *pusBuffer = 0;
+ unsigned short __user *pusBuffer = NULL;
if( copy_from_user(&rReadData, arg,
sizeof(MW_READWRITE)) )
@@ -200,7 +200,7 @@
case IOCTL_MW_READ_INST: {
MW_READWRITE rReadData;
- unsigned short __user *pusBuffer = 0;
+ unsigned short __user *pusBuffer = NULL;
if( copy_from_user(&rReadData, arg,
sizeof(MW_READWRITE)) )
@@ -221,7 +221,7 @@
case IOCTL_MW_WRITE_DATA: {
MW_READWRITE rWriteData;
- unsigned short __user *pusBuffer = 0;
+ unsigned short __user *pusBuffer = NULL;
if( copy_from_user(&rWriteData, arg,
sizeof(MW_READWRITE)) )
@@ -242,7 +242,7 @@
case IOCTL_MW_WRITE_INST: {
MW_READWRITE rWriteData;
- unsigned short __user *pusBuffer = 0;
+ unsigned short __user *pusBuffer = NULL;
if( copy_from_user(&rWriteData, arg,
sizeof(MW_READWRITE)) )
diff -Nru a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
--- a/drivers/char/mwave/tp3780i.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/char/mwave/tp3780i.c 2004-07-12 11:11:41 -07:00
@@ -277,7 +277,7 @@
release_region(pSettings->usDspBaseIO & (~3), 16);
if (pSettings->bInterruptClaimed) {
- free_irq(pSettings->usDspIrq, 0);
+ free_irq(pSettings->usDspIrq, NULL);
pSettings->bInterruptClaimed = FALSE;
}
@@ -372,7 +372,7 @@
PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: Could not get UART IRQ %x\n", pSettings->usUartIrq);
goto exit_cleanup;
} else { /* no conflict just release */
- free_irq(pSettings->usUartIrq, 0);
+ free_irq(pSettings->usUartIrq, NULL);
}
if (request_irq(pSettings->usDspIrq, &DspInterrupt, 0, "mwave_3780i", 0)) {
@@ -416,7 +416,7 @@
if (bDSPPoweredUp)
smapi_set_DSP_power_state(FALSE);
if (bInterruptAllocated) {
- free_irq(pSettings->usDspIrq, 0);
+ free_irq(pSettings->usDspIrq, NULL);
pSettings->bInterruptClaimed = FALSE;
}
return -EIO;
@@ -433,7 +433,7 @@
if (pBDData->bDSPEnabled) {
dsp3780I_DisableDSP(&pBDData->rDspSettings);
if (pSettings->bInterruptClaimed) {
- free_irq(pSettings->usDspIrq, 0);
+ free_irq(pSettings->usDspIrq, NULL);
pSettings->bInterruptClaimed = FALSE;
}
smapi_set_DSP_power_state(FALSE);
diff -Nru a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
--- a/drivers/char/pcmcia/synclink_cs.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/char/pcmcia/synclink_cs.c 2004-07-12 11:11:41 -07:00
@@ -1513,7 +1513,7 @@
if (info->tx_buf) {
free_page((unsigned long) info->tx_buf);
- info->tx_buf = 0;
+ info->tx_buf = NULL;
}
spin_lock_irqsave(&info->lock,flags);
@@ -2591,7 +2591,7 @@
shutdown(info);
tty->closing = 0;
- info->tty = 0;
+ info->tty = NULL;
if (info->blocked_open) {
if (info->close_delay) {
@@ -2695,7 +2695,7 @@
info->count = 0;
info->flags &= ~ASYNC_NORMAL_ACTIVE;
- info->tty = 0;
+ info->tty = NULL;
wake_up_interruptible(&info->open_wait);
}
@@ -2872,7 +2872,7 @@
cleanup:
if (retval) {
if (tty->count == 1)
- info->tty = 0; /* tty layer will release tty struct */
+ info->tty = NULL;/* tty layer will release tty struct */
if(info->count)
info->count--;
}
diff -Nru a/drivers/char/rocket.c b/drivers/char/rocket.c
--- a/drivers/char/rocket.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/char/rocket.c 2004-07-12 11:11:41 -07:00
@@ -1115,7 +1115,7 @@
} else {
if (info->xmit_buf) {
free_page((unsigned long) info->xmit_buf);
- info->xmit_buf = 0;
+ info->xmit_buf = NULL;
}
}
info->flags &= ~(ROCKET_INITIALIZED | ROCKET_CLOSING | ROCKET_NORMAL_ACTIVE);
@@ -1292,7 +1292,7 @@
if ((new_serial.flags & ~ROCKET_USR_MASK) != (info->flags & ~ROCKET_USR_MASK))
return -EPERM;
info->flags = ((info->flags & ~ROCKET_USR_MASK) | (new_serial.flags & ROCKET_USR_MASK));
- configure_r_port(info, 0);
+ configure_r_port(info, NULL);
return 0;
}
@@ -1309,7 +1309,7 @@
if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_WARP)
info->tty->alt_speed = 460800;
- configure_r_port(info, 0);
+ configure_r_port(info, NULL);
return 0;
}
@@ -1572,7 +1572,7 @@
info->count = 0;
info->flags &= ~ROCKET_NORMAL_ACTIVE;
- info->tty = 0;
+ info->tty = NULL;
cp = &info->channel;
sDisRxFIFO(cp);
diff -Nru a/drivers/char/rtc.c b/drivers/char/rtc.c
--- a/drivers/char/rtc.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/char/rtc.c 2004-07-12 11:11:41 -07:00
@@ -974,7 +974,7 @@
release_region(RTC_PORT(0), RTC_IO_EXTENT);
return -ENODEV;
}
- if (create_proc_read_entry ("driver/rtc", 0, 0, rtc_read_proc, NULL) == NULL) {
+ if (!create_proc_read_entry ("driver/rtc", 0, NULL, rtc_read_proc, NULL)) {
#ifdef RTC_IRQ
free_irq(RTC_IRQ, NULL);
#endif
diff -Nru a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
--- a/drivers/ide/legacy/ide-cs.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/ide/legacy/ide-cs.c 2004-07-12 11:11:41 -07:00
@@ -230,7 +230,7 @@
cisparse_t parse;
config_info_t conf;
cistpl_cftable_entry_t dflt;
- } *stk = 0;
+ } *stk = NULL;
cistpl_cftable_entry_t *cfg;
int i, pass, last_ret = 0, last_fn = 0, hd, is_kme = 0;
unsigned long io_base, ctl_base;
diff -Nru a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
--- a/drivers/ide/pci/siimage.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/ide/pci/siimage.c 2004-07-12 11:11:41 -07:00
@@ -1007,7 +1007,7 @@
pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
class_rev &= 0xff;
- hwif->hwif_data = 0;
+ hwif->hwif_data = NULL;
hwif->rqsize = 128;
if (is_sata(hwif) && is_dev_seagate_sata(&hwif->drives[0]))
diff -Nru a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
--- a/drivers/input/joystick/grip.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/input/joystick/grip.c 2004-07-12 11:11:41 -07:00
@@ -76,8 +76,8 @@
static char *grip_name[] = { NULL, "Gravis GamePad Pro", "Gravis Blackhawk Digital",
"Gravis Xterminator Digital", "Gravis Xterminator DualControl" };
-static int *grip_abs[] = { 0, grip_abs_gpp, grip_abs_bd, grip_abs_xt, grip_abs_dc };
-static int *grip_btn[] = { 0, grip_btn_gpp, grip_btn_bd, grip_btn_xt, grip_btn_dc };
+static int *grip_abs[] = { NULL, grip_abs_gpp, grip_abs_bd, grip_abs_xt, grip_abs_dc };
+static int *grip_btn[] = { NULL, grip_btn_gpp, grip_btn_bd, grip_btn_xt, grip_btn_dc };
static char grip_anx[] = { 0, 0, 3, 5, 5 };
static char grip_cen[] = { 0, 0, 2, 2, 4 };
diff -Nru a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
--- a/drivers/input/joystick/grip_mp.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/input/joystick/grip_mp.c 2004-07-12 11:11:41 -07:00
@@ -92,8 +92,8 @@
static int grip_abs_gp[] = { ABS_X, ABS_Y, -1 };
static int grip_abs_c64[] = { ABS_X, ABS_Y, -1 };
-static int *grip_abs[] = { 0, 0, grip_abs_gp, grip_abs_c64 };
-static int *grip_btn[] = { 0, 0, grip_btn_gp, grip_btn_c64 };
+static int *grip_abs[] = { NULL, NULL, grip_abs_gp, grip_abs_c64 };
+static int *grip_btn[] = { NULL, NULL, grip_btn_gp, grip_btn_c64 };
static char *grip_name[] = { NULL, NULL, "Gravis Grip Pad", "Commodore 64 Joystick" };
diff -Nru a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
--- a/drivers/md/kcopyd.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/md/kcopyd.c 2004-07-12 11:11:41 -07:00
@@ -84,7 +84,7 @@
;
kc->pages = pl->next;
- pl->next = 0;
+ pl->next = NULL;
spin_unlock(&kc->lock);
diff -Nru a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
--- a/drivers/media/radio/miropcm20-radio.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/radio/miropcm20-radio.c 2004-07-12 11:11:41 -07:00
@@ -61,7 +61,7 @@
freql = freq & 0xff;
freqh = freq >> 8;
- aci_rds_cmd(RDS_RESET, 0, 0);
+ aci_rds_cmd(RDS_RESET, NULL, 0);
pcm20_stereo(dev, 1);
return aci_rw_cmd(ACI_WRITE_TUNE, freql, freqh);
diff -Nru a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
--- a/drivers/media/video/bttv-cards.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/bttv-cards.c 2004-07-12 11:11:41 -07:00
@@ -4063,7 +4063,7 @@
return;
}
- rc=bttv_I2CRead(btv,(PX_I2C_PIC<<1),0);
+ rc=bttv_I2CRead(btv,(PX_I2C_PIC<<1),NULL);
if (!(rc & PX_CFG_PXC200F)) {
printk(KERN_DEBUG "bttv%d: PXC200_muxsel: not PXC200F rc:%d \n", btv->c.nr,rc);
return;
diff -Nru a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
--- a/drivers/media/video/bw-qcam.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/bw-qcam.c 2004-07-12 11:11:41 -07:00
@@ -660,7 +660,7 @@
}
pixels_read += bytes;
}
- (void) qc_readbytes(q, 0); /* reset state machine */
+ (void) qc_readbytes(q, NULL); /* reset state machine */
/* Grabbing an entire frame from the quickcam is a lengthy
process. We don't (usually) want to busy-block the
diff -Nru a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
--- a/drivers/media/video/cpia.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/cpia.c 2004-07-12 11:11:41 -07:00
@@ -1400,7 +1400,7 @@
static void proc_cpia_create(void)
{
- cpia_proc_root = create_proc_entry("cpia", S_IFDIR, 0);
+ cpia_proc_root = create_proc_entry("cpia", S_IFDIR, NULL);
if (cpia_proc_root)
cpia_proc_root->owner = THIS_MODULE;
@@ -1410,7 +1410,7 @@
static void __exit proc_cpia_destroy(void)
{
- remove_proc_entry("cpia", 0);
+ remove_proc_entry("cpia", NULL);
}
#endif /* CONFIG_PROC_FS */
@@ -1624,7 +1624,7 @@
int i;
rvfree(cam->frame_buf, FRAME_NUM*CPIA_MAX_FRAME_SIZE);
- cam->frame_buf = 0;
+ cam->frame_buf = NULL;
for (i=0; i < FRAME_NUM; i++)
cam->frame[i].data = NULL;
diff -Nru a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
--- a/drivers/media/video/dpc7146.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/dpc7146.c 2004-07-12 11:11:41 -07:00
@@ -91,7 +91,7 @@
/* fixme: add vbi stuff here */
static int dpc_probe(struct saa7146_dev* dev)
{
- struct dpc* dpc = 0;
+ struct dpc* dpc = NULL;
struct i2c_client *client;
struct list_head *item;
diff -Nru a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
--- a/drivers/media/video/hexium_orion.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/hexium_orion.c 2004-07-12 11:11:41 -07:00
@@ -212,7 +212,7 @@
without eeprom */
static int hexium_probe(struct saa7146_dev *dev)
{
- struct hexium *hexium = 0;
+ struct hexium *hexium = NULL;
union i2c_smbus_data data;
int err = 0;
diff -Nru a/drivers/media/video/meye.c b/drivers/media/video/meye.c
--- a/drivers/media/video/meye.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/meye.c 2004-07-12 11:11:41 -07:00
@@ -203,7 +203,7 @@
PAGE_SIZE,
meye.mchip_ptable_toc,
meye.mchip_dmahandle);
- meye.mchip_ptable_toc = 0;
+ meye.mchip_ptable_toc = NULL;
meye.mchip_dmahandle = 0;
return -1;
}
@@ -232,7 +232,7 @@
meye.mchip_dmahandle);
memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
- meye.mchip_ptable_toc = 0;
+ meye.mchip_ptable_toc = NULL;
meye.mchip_dmahandle = 0;
}
diff -Nru a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
--- a/drivers/media/video/mxb.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/mxb.c 2004-07-12 11:11:41 -07:00
@@ -150,7 +150,7 @@
static int mxb_probe(struct saa7146_dev* dev)
{
- struct mxb* mxb = 0;
+ struct mxb* mxb = NULL;
struct i2c_client *client;
struct list_head *item;
int result;
diff -Nru a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
--- a/drivers/media/video/tea6415c.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/tea6415c.c 2004-07-12 11:11:41 -07:00
@@ -57,7 +57,7 @@
/* this function is called by i2c_probe */
static int tea6415c_detect(struct i2c_adapter *adapter, int address, int kind)
{
- struct i2c_client *client = 0;
+ struct i2c_client *client = NULL;
int err = 0;
/* let's see whether this adapter can support what we need */
diff -Nru a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
--- a/drivers/media/video/videocodec.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/videocodec.c 2004-07-12 11:11:41 -07:00
@@ -458,7 +458,7 @@
videocodec_buf = NULL;
videocodec_bufsize = 0;
- videocodec_proc_entry = create_proc_entry("videocodecs", 0, 0);
+ videocodec_proc_entry = create_proc_entry("videocodecs", 0, NULL);
if (videocodec_proc_entry) {
videocodec_proc_entry->read_proc = videocodec_info;
videocodec_proc_entry->write_proc = NULL;
@@ -475,7 +475,7 @@
videocodec_exit (void)
{
#ifdef CONFIG_PROC_FS
- remove_proc_entry("videocodecs", 0);
+ remove_proc_entry("videocodecs", NULL);
if (videocodec_buf)
kfree(videocodec_buf);
#endif
diff -Nru a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
--- a/drivers/media/video/zoran_driver.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/zoran_driver.c 2004-07-12 11:11:41 -07:00
@@ -424,17 +424,15 @@
ZR_DEVNAME(zr), size >> 10);
return -ENOBUFS;
}
- fh->v4l_buffers.buffer[0].fbuffer = 0;
- fh->v4l_buffers.buffer[0].fbuffer_phys =
- pmem;
- fh->v4l_buffers.buffer[0].fbuffer_bus =
- pmem;
+ fh->v4l_buffers.buffer[0].fbuffer = NULL;
+ fh->v4l_buffers.buffer[0].fbuffer_phys = pmem;
+ fh->v4l_buffers.buffer[0].fbuffer_bus = pmem;
dprintk(4,
KERN_INFO
"%s: v4l_fbuffer_alloc() - using %d KB high memory\n",
ZR_DEVNAME(zr), size >> 10);
} else {
- fh->v4l_buffers.buffer[i].fbuffer = 0;
+ fh->v4l_buffers.buffer[i].fbuffer = NULL;
fh->v4l_buffers.buffer[i].fbuffer_phys =
pmem + i * fh->v4l_buffers.buffer_size;
fh->v4l_buffers.buffer[i].fbuffer_bus =
diff -Nru a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c
--- a/drivers/media/video/zoran_procfs.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/media/video/zoran_procfs.c 2004-07-12 11:11:41 -07:00
@@ -252,7 +252,7 @@
char name[8];
snprintf(name, 7, "zoran%d", zr->id);
- if ((zr->zoran_proc = create_proc_entry(name, 0, 0))) {
+ if ((zr->zoran_proc = create_proc_entry(name, 0, NULL))) {
zr->zoran_proc->read_proc = zoran_read_proc;
zr->zoran_proc->write_proc = zoran_write_proc;
zr->zoran_proc->data = zr;
@@ -278,7 +278,7 @@
snprintf(name, 7, "zoran%d", zr->id);
if (zr->zoran_proc) {
- remove_proc_entry(name, 0);
+ remove_proc_entry(name, NULL);
}
zr->zoran_proc = NULL;
#endif
diff -Nru a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
--- a/drivers/message/fusion/mptscsih.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/message/fusion/mptscsih.c 2004-07-12 11:11:41 -07:00
@@ -99,7 +99,7 @@
/* Set string for command line args from insmod */
#ifdef MODULE
-char *mptscsih = 0;
+char *mptscsih = NULL;
#endif
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
diff -Nru a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
--- a/drivers/message/i2o/i2o_config.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/message/i2o/i2o_config.c 2004-07-12 11:11:41 -07:00
@@ -857,7 +857,7 @@
u32 sg_count = 0;
int sg_index = 0;
u32 i = 0;
- void *p = 0;
+ void *p = NULL;
unsigned int iop;
if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
diff -Nru a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
--- a/drivers/message/i2o/i2o_proc.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/message/i2o/i2o_proc.c 2004-07-12 11:11:41 -07:00
@@ -3337,7 +3337,7 @@
struct i2o_controller *pctrl = NULL;
int i;
- i2o_proc_dir_root = proc_mkdir("i2o", 0);
+ i2o_proc_dir_root = proc_mkdir("i2o", NULL);
if(!i2o_proc_dir_root)
return -1;
i2o_proc_dir_root->owner = THIS_MODULE;
@@ -3371,7 +3371,7 @@
}
if(!atomic_read(&i2o_proc_dir_root->count))
- remove_proc_entry("i2o", 0);
+ remove_proc_entry("i2o", NULL);
else
return -1;
diff -Nru a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
--- a/drivers/net/appletalk/ltpc.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/appletalk/ltpc.c 2004-07-12 11:11:41 -07:00
@@ -501,7 +501,7 @@
/* FIXME This is initialized to shut the warning up, but I need to
* think this through again.
*/
- struct xmitQel *q=0;
+ struct xmitQel *q = NULL;
int oops;
int i;
int base = dev->base_addr;
@@ -1203,7 +1203,7 @@
if (err)
goto out4;
- return 0;
+ return NULL;
out4:
del_timer_sync(<pc_timer);
if (dev->irq)
diff -Nru a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
--- a/drivers/net/irda/irtty-sir.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/irda/irtty-sir.c 2004-07-12 11:11:41 -07:00
@@ -584,7 +584,7 @@
*/
/* we are dead now */
- tty->disc_data = 0;
+ tty->disc_data = NULL;
sirdev_put_instance(priv->dev);
diff -Nru a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
--- a/drivers/net/irda/vlsi_ir.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/irda/vlsi_ir.c 2004-07-12 11:11:41 -07:00
@@ -1876,7 +1876,7 @@
* Failure to create the procfs entry is handled like running
* without procfs - it's not required for the driver to work.
*/
- vlsi_proc_root = create_proc_entry(PROC_DIR, S_IFDIR, 0);
+ vlsi_proc_root = create_proc_entry(PROC_DIR, S_IFDIR, NULL);
if (vlsi_proc_root) {
/* protect registered procdir against module removal.
* Because we are in the module init path there's no race
@@ -1888,7 +1888,7 @@
ret = pci_module_init(&vlsi_irda_driver);
if (ret && vlsi_proc_root)
- remove_proc_entry(PROC_DIR, 0);
+ remove_proc_entry(PROC_DIR, NULL);
return ret;
}
@@ -1897,7 +1897,7 @@
{
pci_unregister_driver(&vlsi_irda_driver);
if (vlsi_proc_root)
- remove_proc_entry(PROC_DIR, 0);
+ remove_proc_entry(PROC_DIR, NULL);
}
module_init(vlsi_mod_init);
diff -Nru a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
--- a/drivers/net/pcmcia/smc91c92_cs.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/pcmcia/smc91c92_cs.c 2004-07-12 11:11:41 -07:00
@@ -1272,7 +1272,7 @@
link->open++;
netif_start_queue(dev);
- smc->saved_skb = 0;
+ smc->saved_skb = NULL;
smc->packets_waiting = 0;
smc_reset(dev);
diff -Nru a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
--- a/drivers/net/pcmcia/xirc2ps_cs.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/pcmcia/xirc2ps_cs.c 2004-07-12 11:11:41 -07:00
@@ -815,7 +815,7 @@
cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
cistpl_cftable_entry_t *cf = &parse.cftable_entry;
- local->dingo_ccr = 0;
+ local->dingo_ccr = NULL;
DEBUG(0, "config(0x%p)\n", link);
diff -Nru a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
--- a/drivers/net/tokenring/ibmtr.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/tokenring/ibmtr.c 2004-07-12 11:11:41 -07:00
@@ -383,7 +383,7 @@
{
unsigned char segment, intr=0, irq=0, i, j, cardpresent=NOTOK, temp=0;
- void * t_mmio = 0;
+ void * t_mmio = NULL;
struct tok_info *ti = dev->priv;
void *cd_chanid;
unsigned char *tchanid, ctemp;
diff -Nru a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
--- a/drivers/net/wan/cosa.c 2004-07-12 11:11:41 -07:00
+++ b/drivers/net/wan/cosa.c 2004-07-12 11:11:41 -07:00
@@ -729,7 +729,7 @@
cosa_kick(chan->cosa);
if (chan->tx_skb) {
dev_kfree_skb(chan->tx_skb);
- chan->tx_skb = 0;
+ chan->tx_skb = NULL;
}
netif_wake_queue(dev);
}
@@ -745,11 +745,11 @@
spin_lock_irqsave(&chan->cosa->lock, flags);
if (chan->rx_skb) {
kfree_skb(chan->rx_skb);
- chan->rx_skb = 0;
+ chan->rx_skb = NULL;
}
if (chan->tx_skb) {
kfree_skb(chan->tx_skb);
- chan->tx_skb = 0;
+ chan->tx_skb = NULL;
}
chan->usage=0;
chan->cosa->usage--;
@@ -791,7 +791,7 @@
chan->stats.rx_packets++;
chan->stats.rx_bytes += chan->cosa->rxsize;
netif_rx(chan->rx_skb);
- chan->rx_skb = 0;
+ chan->rx_skb = NULL;
chan->pppdev.dev->last_rx = jiffies;
return 0;
}
@@ -807,7 +807,7 @@
return 1;
}
dev_kfree_skb_irq(chan->tx_skb);
- chan->tx_skb = 0;
+ chan->tx_skb = NULL;
chan->stats.tx_packets++;
chan->stats.tx_bytes += size;
netif_wake_queue(chan->pppdev.dev);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
(Log in to post comments)
|
|||||||||||||