From: Randy Dunlap 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 Signed-off-by: Andrew Morton --- arch/i386/kernel/reboot_fixups.c | 2 +- drivers/char/tpm/tpm_atmel.c | 2 +- drivers/char/tpm/tpm_nsc.c | 2 +- drivers/isdn/hisax/hfc4s8s_l1.c | 10 +++++----- drivers/media/dvb/dvb-usb/dtt200u.c | 4 ++-- drivers/media/dvb/dvb-usb/vp7045.c | 2 +- drivers/net/skfp/smt.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff -puN arch/i386/kernel/reboot_fixups.c~sparse-cleanups-null-pointers-c99-struct-init arch/i386/kernel/reboot_fixups.c --- devel/arch/i386/kernel/reboot_fixups.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/arch/i386/kernel/reboot_fixups.c 2005-10-13 15:43:53.000000000 -0700 @@ -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; diff -puN drivers/char/tpm/tpm_atmel.c~sparse-cleanups-null-pointers-c99-struct-init drivers/char/tpm/tpm_atmel.c --- devel/drivers/char/tpm/tpm_atmel.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/drivers/char/tpm/tpm_atmel.c 2005-10-13 15:43:53.000000000 -0700 @@ -137,7 +137,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 }; diff -puN drivers/char/tpm/tpm_nsc.c~sparse-cleanups-null-pointers-c99-struct-init drivers/char/tpm/tpm_nsc.c --- devel/drivers/char/tpm/tpm_nsc.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/drivers/char/tpm/tpm_nsc.c 2005-10-13 15:43:53.000000000 -0700 @@ -239,7 +239,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 }; diff -puN drivers/isdn/hisax/hfc4s8s_l1.c~sparse-cleanups-null-pointers-c99-struct-init drivers/isdn/hisax/hfc4s8s_l1.c --- devel/drivers/isdn/hisax/hfc4s8s_l1.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/drivers/isdn/hisax/hfc4s8s_l1.c 2005-10-13 15:43:53.000000000 -0700 @@ -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 @@ -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, }; /**********************/ diff -puN drivers/media/dvb/dvb-usb/dtt200u.c~sparse-cleanups-null-pointers-c99-struct-init drivers/media/dvb/dvb-usb/dtt200u.c --- devel/drivers/media/dvb/dvb-usb/dtt200u.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/drivers/media/dvb/dvb-usb/dtt200u.c 2005-10-13 15:43:53.000000000 -0700 @@ -151,7 +151,7 @@ static struct dvb_usb_properties dtt200u .cold_ids = { &dtt200u_usb_table[0], NULL }, .warm_ids = { &dtt200u_usb_table[1], NULL }, }, - { 0 }, + { NULL }, } }; @@ -192,7 +192,7 @@ static struct dvb_usb_properties wt220u_ .cold_ids = { &dtt200u_usb_table[2], NULL }, .warm_ids = { &dtt200u_usb_table[3], NULL }, }, - { 0 }, + { NULL }, } }; diff -puN drivers/media/dvb/dvb-usb/vp7045.c~sparse-cleanups-null-pointers-c99-struct-init drivers/media/dvb/dvb-usb/vp7045.c --- devel/drivers/media/dvb/dvb-usb/vp7045.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/drivers/media/dvb/dvb-usb/vp7045.c 2005-10-13 15:43:53.000000000 -0700 @@ -247,7 +247,7 @@ static struct dvb_usb_properties vp7045_ .cold_ids = { &vp7045_usb_table[2], NULL }, .warm_ids = { &vp7045_usb_table[3], NULL }, }, - { 0 }, + { NULL }, } }; diff -puN drivers/net/skfp/smt.c~sparse-cleanups-null-pointers-c99-struct-init drivers/net/skfp/smt.c --- devel/drivers/net/skfp/smt.c~sparse-cleanups-null-pointers-c99-struct-init 2005-10-13 15:43:53.000000000 -0700 +++ devel-akpm/drivers/net/skfp/smt.c 2005-10-13 15:43:53.000000000 -0700 @@ -1896,7 +1896,7 @@ void smt_swap_para(struct smt_header *sm 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) { _