diff options
author | Helge Deller <deller@gmx.de> | 2006-10-14 16:11:32 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:34:42 -0500 |
commit | 93ea774bf2d7f2b04ce4c57dbae08b5fa877296d (patch) | |
tree | c638138ac047567906d59c41adad4f66b33a4ac0 /drivers | |
parent | f8fc18a1323c3f4171a643d6ebf1597f4ba8bc53 (diff) |
[PARISC] lasi_82596: use BUILD_BUG_ON() and constify static array
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/lasi_82596.c | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index ea392f2a5aa2..452863d5d498 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
@@ -384,7 +384,7 @@ struct i596_private { | |||
384 | struct device *dev; | 384 | struct device *dev; |
385 | }; | 385 | }; |
386 | 386 | ||
387 | static char init_setup[] = | 387 | static const char init_setup[] = |
388 | { | 388 | { |
389 | 0x8E, /* length, prefetch on */ | 389 | 0x8E, /* length, prefetch on */ |
390 | 0xC8, /* fifo to 8, monitor off */ | 390 | 0xC8, /* fifo to 8, monitor off */ |
@@ -683,7 +683,7 @@ static int init_i596_mem(struct net_device *dev) | |||
683 | enable_irq(dev->irq); /* enable IRQs from LAN */ | 683 | enable_irq(dev->irq); /* enable IRQs from LAN */ |
684 | 684 | ||
685 | DEB(DEB_INIT, printk("%s: queuing CmdConfigure\n", dev->name)); | 685 | DEB(DEB_INIT, printk("%s: queuing CmdConfigure\n", dev->name)); |
686 | memcpy(lp->cf_cmd.i596_config, init_setup, 14); | 686 | memcpy(lp->cf_cmd.i596_config, init_setup, sizeof(init_setup)); |
687 | lp->cf_cmd.cmd.command = CmdConfigure; | 687 | lp->cf_cmd.cmd.command = CmdConfigure; |
688 | CHECK_WBACK(lp, &(lp->cf_cmd), sizeof(struct cf_cmd)); | 688 | CHECK_WBACK(lp, &(lp->cf_cmd), sizeof(struct cf_cmd)); |
689 | i596_add_cmd(dev, &lp->cf_cmd.cmd); | 689 | i596_add_cmd(dev, &lp->cf_cmd.cmd); |
@@ -1156,32 +1156,12 @@ static int __devinit i82596_probe(struct net_device *dev, | |||
1156 | dma_addr_t dma_addr; | 1156 | dma_addr_t dma_addr; |
1157 | 1157 | ||
1158 | /* This lot is ensure things have been cache line aligned. */ | 1158 | /* This lot is ensure things have been cache line aligned. */ |
1159 | if (sizeof(struct i596_rfd) != 32) { | 1159 | BUILD_BUG_ON(sizeof(struct i596_rfd) != 32); |
1160 | printk("82596: sizeof(struct i596_rfd) = %d\n", | 1160 | BUILD_BUG_ON(sizeof(struct i596_rbd) & 31); |
1161 | (int)sizeof(struct i596_rfd)); | 1161 | BUILD_BUG_ON(sizeof(struct tx_cmd) & 31); |
1162 | return -ENODEV; | 1162 | BUILD_BUG_ON(sizeof(struct i596_tbd) != 32); |
1163 | } | ||
1164 | if ((sizeof(struct i596_rbd) % 32) != 0) { | ||
1165 | printk("82596: sizeof(struct i596_rbd) = %d\n", | ||
1166 | (int)sizeof(struct i596_rbd)); | ||
1167 | return -ENODEV; | ||
1168 | } | ||
1169 | if ((sizeof(struct tx_cmd) % 32) != 0) { | ||
1170 | printk("82596: sizeof(struct tx_cmd) = %d\n", | ||
1171 | (int)sizeof(struct tx_cmd)); | ||
1172 | return -ENODEV; | ||
1173 | } | ||
1174 | if (sizeof(struct i596_tbd) != 32) { | ||
1175 | printk("82596: sizeof(struct i596_tbd) = %d\n", | ||
1176 | (int)sizeof(struct i596_tbd)); | ||
1177 | return -ENODEV; | ||
1178 | } | ||
1179 | #ifndef __LP64__ | 1163 | #ifndef __LP64__ |
1180 | if (sizeof(struct i596_private) > 4096) { | 1164 | BUILD_BUG_ON(sizeof(struct i596_private) > 4096); |
1181 | printk("82596: sizeof(struct i596_private) = %d\n", | ||
1182 | (int)sizeof(struct i596_private)); | ||
1183 | return -ENODEV; | ||
1184 | } | ||
1185 | #endif | 1165 | #endif |
1186 | 1166 | ||
1187 | if (!dev->base_addr || !dev->irq) | 1167 | if (!dev->base_addr || !dev->irq) |