diff options
-rw-r--r-- | arch/i386/kernel/reboot_fixups.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_atmel.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_nsc.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 10 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dtt200u.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045.c | 2 | ||||
-rw-r--r-- | drivers/net/skfp/smt.c | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/i386/kernel/reboot_fixups.c index 1b183b378c2c..c9b87330aeea 100644 --- a/arch/i386/kernel/reboot_fixups.c +++ b/arch/i386/kernel/reboot_fixups.c | |||
@@ -44,7 +44,7 @@ void mach_reboot_fixups(void) | |||
44 | 44 | ||
45 | for (i=0; i < (sizeof(fixups_table)/sizeof(fixups_table[0])); i++) { | 45 | for (i=0; i < (sizeof(fixups_table)/sizeof(fixups_table[0])); i++) { |
46 | cur = &(fixups_table[i]); | 46 | cur = &(fixups_table[i]); |
47 | dev = pci_get_device(cur->vendor, cur->device, 0); | 47 | dev = pci_get_device(cur->vendor, cur->device, NULL); |
48 | if (!dev) | 48 | if (!dev) |
49 | continue; | 49 | continue; |
50 | 50 | ||
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c index d12ac1a346b5..8cb42e84723c 100644 --- a/drivers/char/tpm/tpm_atmel.c +++ b/drivers/char/tpm/tpm_atmel.c | |||
@@ -142,7 +142,7 @@ static struct attribute* atmel_attrs[] = { | |||
142 | &dev_attr_pcrs.attr, | 142 | &dev_attr_pcrs.attr, |
143 | &dev_attr_caps.attr, | 143 | &dev_attr_caps.attr, |
144 | &dev_attr_cancel.attr, | 144 | &dev_attr_cancel.attr, |
145 | 0, | 145 | NULL, |
146 | }; | 146 | }; |
147 | 147 | ||
148 | static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs }; | 148 | static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs }; |
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c index 6adfc07d0fd6..253871b5b1e2 100644 --- a/drivers/char/tpm/tpm_nsc.c +++ b/drivers/char/tpm/tpm_nsc.c | |||
@@ -244,7 +244,7 @@ static struct attribute * nsc_attrs[] = { | |||
244 | &dev_attr_pcrs.attr, | 244 | &dev_attr_pcrs.attr, |
245 | &dev_attr_caps.attr, | 245 | &dev_attr_caps.attr, |
246 | &dev_attr_cancel.attr, | 246 | &dev_attr_cancel.attr, |
247 | 0, | 247 | NULL, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; | 250 | static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index 7333377ab31d..e3866b0a97fd 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
@@ -1063,7 +1063,7 @@ tx_b_frame(struct hfc4s8s_btype *bch) | |||
1063 | Write_hfc8(l1->hw, A_INC_RES_FIFO, 1); | 1063 | Write_hfc8(l1->hw, A_INC_RES_FIFO, 1); |
1064 | } | 1064 | } |
1065 | ack_len += skb->truesize; | 1065 | ack_len += skb->truesize; |
1066 | bch->tx_skb = 0; | 1066 | bch->tx_skb = NULL; |
1067 | bch->tx_cnt = 0; | 1067 | bch->tx_cnt = 0; |
1068 | dev_kfree_skb(skb); | 1068 | dev_kfree_skb(skb); |
1069 | } else | 1069 | } else |
@@ -1659,10 +1659,10 @@ hfc4s8s_remove(struct pci_dev *pdev) | |||
1659 | } | 1659 | } |
1660 | 1660 | ||
1661 | static struct pci_driver hfc4s8s_driver = { | 1661 | static struct pci_driver hfc4s8s_driver = { |
1662 | name:"hfc4s8s_l1", | 1662 | .name = "hfc4s8s_l1", |
1663 | probe:hfc4s8s_probe, | 1663 | .probe = hfc4s8s_probe, |
1664 | remove:__devexit_p(hfc4s8s_remove), | 1664 | .remove = __devexit_p(hfc4s8s_remove), |
1665 | id_table:hfc4s8s_ids, | 1665 | .id_table = hfc4s8s_ids, |
1666 | }; | 1666 | }; |
1667 | 1667 | ||
1668 | /**********************/ | 1668 | /**********************/ |
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c index 5aa12ebab34f..b595476332cd 100644 --- a/drivers/media/dvb/dvb-usb/dtt200u.c +++ b/drivers/media/dvb/dvb-usb/dtt200u.c | |||
@@ -151,7 +151,7 @@ static struct dvb_usb_properties dtt200u_properties = { | |||
151 | .cold_ids = { &dtt200u_usb_table[0], NULL }, | 151 | .cold_ids = { &dtt200u_usb_table[0], NULL }, |
152 | .warm_ids = { &dtt200u_usb_table[1], NULL }, | 152 | .warm_ids = { &dtt200u_usb_table[1], NULL }, |
153 | }, | 153 | }, |
154 | { 0 }, | 154 | { NULL }, |
155 | } | 155 | } |
156 | }; | 156 | }; |
157 | 157 | ||
@@ -192,7 +192,7 @@ static struct dvb_usb_properties wt220u_properties = { | |||
192 | .cold_ids = { &dtt200u_usb_table[2], NULL }, | 192 | .cold_ids = { &dtt200u_usb_table[2], NULL }, |
193 | .warm_ids = { &dtt200u_usb_table[3], NULL }, | 193 | .warm_ids = { &dtt200u_usb_table[3], NULL }, |
194 | }, | 194 | }, |
195 | { 0 }, | 195 | { NULL }, |
196 | } | 196 | } |
197 | }; | 197 | }; |
198 | 198 | ||
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c index 0f57abeb6d6b..75765e3a569c 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.c +++ b/drivers/media/dvb/dvb-usb/vp7045.c | |||
@@ -247,7 +247,7 @@ static struct dvb_usb_properties vp7045_properties = { | |||
247 | .cold_ids = { &vp7045_usb_table[2], NULL }, | 247 | .cold_ids = { &vp7045_usb_table[2], NULL }, |
248 | .warm_ids = { &vp7045_usb_table[3], NULL }, | 248 | .warm_ids = { &vp7045_usb_table[3], NULL }, |
249 | }, | 249 | }, |
250 | { 0 }, | 250 | { NULL }, |
251 | } | 251 | } |
252 | }; | 252 | }; |
253 | 253 | ||
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c index f17c05cbe44b..99a776a51fb5 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/skfp/smt.c | |||
@@ -1896,7 +1896,7 @@ void smt_swap_para(struct smt_header *sm, int len, int direction) | |||
1896 | 1896 | ||
1897 | static void smt_string_swap(char *data, const char *format, int len) | 1897 | static void smt_string_swap(char *data, const char *format, int len) |
1898 | { | 1898 | { |
1899 | const char *open_paren = 0 ; | 1899 | const char *open_paren = NULL ; |
1900 | int x ; | 1900 | int x ; |
1901 | 1901 | ||
1902 | while (len > 0 && *format) { | 1902 | while (len > 0 && *format) { |