projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pdc202xx_old: remove dead code
[powerpc.git]
/
drivers
/
atm
/
zatm.c
diff --git
a/drivers/atm/zatm.c
b/drivers/atm/zatm.c
index
083c5d3
..
0d7091e
100644
(file)
--- a/
drivers/atm/zatm.c
+++ b/
drivers/atm/zatm.c
@@
-4,7
+4,6
@@
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/pci.h>
@@
-996,7
+995,7
@@
static int start_tx(struct atm_dev *dev)
DPRINTK("start_tx\n");
zatm_dev = ZATM_DEV(dev);
DPRINTK("start_tx\n");
zatm_dev = ZATM_DEV(dev);
- zatm_dev->tx_map =
(struct atm_vcc **)
kmalloc(sizeof(struct atm_vcc *)*
+ zatm_dev->tx_map = kmalloc(sizeof(struct atm_vcc *)*
zatm_dev->chans,GFP_KERNEL);
if (!zatm_dev->tx_map) return -ENOMEM;
zatm_dev->tx_bw = ATM_OC3_PCR;
zatm_dev->chans,GFP_KERNEL);
if (!zatm_dev->tx_map) return -ENOMEM;
zatm_dev->tx_bw = ATM_OC3_PCR;
@@
-1012,7
+1011,7
@@
static int start_tx(struct atm_dev *dev)
/*------------------------------- interrupts --------------------------------*/
/*------------------------------- interrupts --------------------------------*/
-static irqreturn_t zatm_int(int irq,void *dev_id
,struct pt_regs *regs
)
+static irqreturn_t zatm_int(int irq,void *dev_id)
{
struct atm_dev *dev;
struct zatm_dev *zatm_dev;
{
struct atm_dev *dev;
struct zatm_dev *zatm_dev;
@@
-1591,7
+1590,7
@@
static int __devinit zatm_init_one(struct pci_dev *pci_dev,
struct zatm_dev *zatm_dev;
int ret = -ENOMEM;
struct zatm_dev *zatm_dev;
int ret = -ENOMEM;
- zatm_dev =
(struct zatm_dev *)
kmalloc(sizeof(*zatm_dev), GFP_KERNEL);
+ zatm_dev = kmalloc(sizeof(*zatm_dev), GFP_KERNEL);
if (!zatm_dev) {
printk(KERN_EMERG "%s: memory shortage\n", DEV_LABEL);
goto out;
if (!zatm_dev) {
printk(KERN_EMERG "%s: memory shortage\n", DEV_LABEL);
goto out;