git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
avm
/
b1.c
diff --git
a/drivers/isdn/hardware/avm/b1.c
b/drivers/isdn/hardware/avm/b1.c
index
0c7061d
..
7a69a18
100644
(file)
--- a/
drivers/isdn/hardware/avm/b1.c
+++ b/
drivers/isdn/hardware/avm/b1.c
@@
-65,18
+65,15
@@
avmcard *b1_alloc_card(int nr_controllers)
avmctrl_info *cinfo;
int i;
avmctrl_info *cinfo;
int i;
- card = k
m
alloc(sizeof(*card), GFP_KERNEL);
+ card = k
z
alloc(sizeof(*card), GFP_KERNEL);
if (!card)
return NULL;
if (!card)
return NULL;
- memset(card, 0, sizeof(*card));
-
- cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
+ cinfo = kzalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
if (!cinfo) {
kfree(card);
return NULL;
}
if (!cinfo) {
kfree(card);
return NULL;
}
- memset(cinfo, 0, sizeof(*cinfo) * nr_controllers);
card->ctrlinfo = cinfo;
for (i = 0; i < nr_controllers; i++) {
card->ctrlinfo = cinfo;
for (i = 0; i < nr_controllers; i++) {
@@
-485,7
+482,7
@@
void b1_parse_version(avmctrl_info *cinfo)
/* ------------------------------------------------------------- */
/* ------------------------------------------------------------- */
-irqreturn_t b1_interrupt(int interrupt, void *devptr
, struct pt_regs *regs
)
+irqreturn_t b1_interrupt(int interrupt, void *devptr)
{
avmcard *card = devptr;
avmctrl_info *cinfo = &card->ctrlinfo[0];
{
avmcard *card = devptr;
avmctrl_info *cinfo = &card->ctrlinfo[0];
@@
-718,12
+715,11
@@
avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize)
avmcard_dmainfo *p;
void *buf;
avmcard_dmainfo *p;
void *buf;
- p = k
m
alloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
+ p = k
z
alloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
if (!p) {
printk(KERN_WARNING "%s: no memory.\n", name);
goto err;
}
if (!p) {
printk(KERN_WARNING "%s: no memory.\n", name);
goto err;
}
- memset(p, 0, sizeof(avmcard_dmainfo));
p->recvbuf.size = rsize;
buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr);
p->recvbuf.size = rsize;
buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr);