Skip to content

Commit

Permalink
[PATCH] sparse cleanups: NULL pointers, C99 struct init.
Browse files Browse the repository at this point in the history
Convert most of the remaining "Using plain integer as NULL pointer" sparse
warnings to use NULL.  (Not duplicating patches that are already in -mm,
-bird, or -kj.)

Convert isdn driver struct initializer to use C99 syntax.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Oct 31, 2005
1 parent b888c87 commit 874ec33
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion arch/i386/kernel/reboot_fixups.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void mach_reboot_fixups(void)

for (i=0; i < (sizeof(fixups_table)/sizeof(fixups_table[0])); i++) {
cur = &(fixups_table[i]);
dev = pci_get_device(cur->vendor, cur->device, 0);
dev = pci_get_device(cur->vendor, cur->device, NULL);
if (!dev)
continue;

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/tpm/tpm_atmel.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static struct attribute* atmel_attrs[] = {
&dev_attr_pcrs.attr,
&dev_attr_caps.attr,
&dev_attr_cancel.attr,
0,
NULL,
};

static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs };
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/tpm/tpm_nsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static struct attribute * nsc_attrs[] = {
&dev_attr_pcrs.attr,
&dev_attr_caps.attr,
&dev_attr_cancel.attr,
0,
NULL,
};

static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs };
Expand Down
10 changes: 5 additions & 5 deletions drivers/isdn/hisax/hfc4s8s_l1.c
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ tx_b_frame(struct hfc4s8s_btype *bch)
Write_hfc8(l1->hw, A_INC_RES_FIFO, 1);
}
ack_len += skb->truesize;
bch->tx_skb = 0;
bch->tx_skb = NULL;
bch->tx_cnt = 0;
dev_kfree_skb(skb);
} else
Expand Down Expand Up @@ -1659,10 +1659,10 @@ hfc4s8s_remove(struct pci_dev *pdev)
}

static struct pci_driver hfc4s8s_driver = {
name:"hfc4s8s_l1",
probe:hfc4s8s_probe,
remove:__devexit_p(hfc4s8s_remove),
id_table:hfc4s8s_ids,
.name = "hfc4s8s_l1",
.probe = hfc4s8s_probe,
.remove = __devexit_p(hfc4s8s_remove),
.id_table = hfc4s8s_ids,
};

/**********************/
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/dvb/dvb-usb/dtt200u.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static struct dvb_usb_properties dtt200u_properties = {
.cold_ids = { &dtt200u_usb_table[0], NULL },
.warm_ids = { &dtt200u_usb_table[1], NULL },
},
{ 0 },
{ NULL },
}
};

Expand Down Expand Up @@ -192,7 +192,7 @@ static struct dvb_usb_properties wt220u_properties = {
.cold_ids = { &dtt200u_usb_table[2], NULL },
.warm_ids = { &dtt200u_usb_table[3], NULL },
},
{ 0 },
{ NULL },
}
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/vp7045.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static struct dvb_usb_properties vp7045_properties = {
.cold_ids = { &vp7045_usb_table[2], NULL },
.warm_ids = { &vp7045_usb_table[3], NULL },
},
{ 0 },
{ NULL },
}
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/skfp/smt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1896,7 +1896,7 @@ void smt_swap_para(struct smt_header *sm, int len, int direction)

static void smt_string_swap(char *data, const char *format, int len)
{
const char *open_paren = 0 ;
const char *open_paren = NULL ;
int x ;

while (len > 0 && *format) {
Expand Down

0 comments on commit 874ec33

Please sign in to comment.