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
/
atm
/
lanai.c
diff --git
a/drivers/atm/lanai.c
b/drivers/atm/lanai.c
index
69f4c7c
..
09f477d
100644
(file)
--- a/
drivers/atm/lanai.c
+++ b/
drivers/atm/lanai.c
@@
-1482,16
+1482,10
@@
static inline void vcc_table_deallocate(const struct lanai_dev *lanai)
static inline struct lanai_vcc *new_lanai_vcc(void)
{
struct lanai_vcc *lvcc;
static inline struct lanai_vcc *new_lanai_vcc(void)
{
struct lanai_vcc *lvcc;
- lvcc =
(struct lanai_vcc *) km
alloc(sizeof(*lvcc), GFP_KERNEL);
+ lvcc =
kz
alloc(sizeof(*lvcc), GFP_KERNEL);
if (likely(lvcc != NULL)) {
if (likely(lvcc != NULL)) {
- lvcc->vbase = NULL;
- lvcc->rx.atmvcc = lvcc->tx.atmvcc = NULL;
- lvcc->nref = 0;
- memset(&lvcc->stats, 0, sizeof lvcc->stats);
- lvcc->rx.buf.start = lvcc->tx.buf.start = NULL;
skb_queue_head_init(&lvcc->tx.backlog);
#ifdef DEBUG
skb_queue_head_init(&lvcc->tx.backlog);
#ifdef DEBUG
- lvcc->tx.unqueue = NULL;
lvcc->vci = -1;
#endif
}
lvcc->vci = -1;
#endif
}
@@
-1896,13
+1890,11
@@
static inline void lanai_int_1(struct lanai_dev *lanai, u32 reason)
reg_write(lanai, ack, IntAck_Reg);
}
reg_write(lanai, ack, IntAck_Reg);
}
-static irqreturn_t lanai_int(int irq, void *devid
, struct pt_regs *regs
)
+static irqreturn_t lanai_int(int irq, void *devid)
{
{
- struct lanai_dev *lanai =
(struct lanai_dev *)
devid;
+ struct lanai_dev *lanai = devid;
u32 reason;
u32 reason;
- (void) irq; (void) regs; /* unused variables */
-
#ifdef USE_POWERDOWN
/*
* If we're powered down we shouldn't be generating any interrupts -
#ifdef USE_POWERDOWN
/*
* If we're powered down we shouldn't be generating any interrupts -
@@
-1972,7
+1964,7
@@
static int __devinit lanai_pci_start(struct lanai_dev *lanai)
"(itf %d): No suitable DMA available.\n", lanai->number);
return -EBUSY;
}
"(itf %d): No suitable DMA available.\n", lanai->number);
return -EBUSY;
}
- if (pci_set_consistent_dma_mask(pci,
0xFFFFFFFF
) != 0) {
+ if (pci_set_consistent_dma_mask(pci,
DMA_32BIT_MASK
) != 0) {
printk(KERN_WARNING DEV_LABEL
"(itf %d): No suitable DMA available.\n", lanai->number);
return -EBUSY;
printk(KERN_WARNING DEV_LABEL
"(itf %d): No suitable DMA available.\n", lanai->number);
return -EBUSY;
@@
-2240,7
+2232,7
@@
static int __devinit lanai_dev_open(struct atm_dev *atmdev)
conf2_write(lanai);
reg_write(lanai, TX_FIFO_DEPTH, TxDepth_Reg);
reg_write(lanai, 0, CBR_ICG_Reg); /* CBR defaults to no limit */
conf2_write(lanai);
reg_write(lanai, TX_FIFO_DEPTH, TxDepth_Reg);
reg_write(lanai, 0, CBR_ICG_Reg); /* CBR defaults to no limit */
- if ((result = request_irq(lanai->pci->irq, lanai_int,
SA_SHIRQ
,
+ if ((result = request_irq(lanai->pci->irq, lanai_int,
IRQF_SHARED
,
DEV_LABEL, lanai)) != 0) {
printk(KERN_ERR DEV_LABEL ": can't allocate interrupt\n");
goto error_vcctable;
DEV_LABEL, lanai)) != 0) {
printk(KERN_ERR DEV_LABEL ": can't allocate interrupt\n");
goto error_vcctable;
@@
-2610,7
+2602,7
@@
static int __devinit lanai_init_one(struct pci_dev *pci,
struct atm_dev *atmdev;
int result;
struct atm_dev *atmdev;
int result;
- lanai =
(struct lanai_dev *)
kmalloc(sizeof(*lanai), GFP_KERNEL);
+ lanai = kmalloc(sizeof(*lanai), GFP_KERNEL);
if (lanai == NULL) {
printk(KERN_ERR DEV_LABEL
": couldn't allocate dev_data structure!\n");
if (lanai == NULL) {
printk(KERN_ERR DEV_LABEL
": couldn't allocate dev_data structure!\n");