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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
atm
/
fore200e.c
diff --git
a/drivers/atm/fore200e.c
b/drivers/atm/fore200e.c
index
5f70219
..
05983a3
100644
(file)
--- a/
drivers/atm/fore200e.c
+++ b/
drivers/atm/fore200e.c
@@
-178,14
+178,12
@@
fore200e_irq_itoa(int irq)
static void*
static void*
-fore200e_kmalloc(int size,
in
t flags)
+fore200e_kmalloc(int size,
gfp_
t flags)
{
{
- void
* chunk = km
alloc(size, flags);
+ void
*chunk = kz
alloc(size, flags);
- if (chunk)
- memset(chunk, 0x00, size);
- else
- printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n", size, flags);
+ if (!chunk)
+ printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n", size, flags);
return chunk;
}
return chunk;
}
@@
-557,7
+555,7
@@
fore200e_pca_reset(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_pca_map(struct fore200e* fore200e)
{
DPRINTK(2, "device %s being mapped in memory\n", fore200e->name);
fore200e_pca_map(struct fore200e* fore200e)
{
DPRINTK(2, "device %s being mapped in memory\n", fore200e->name);
@@
-591,7
+589,7
@@
fore200e_pca_unmap(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_pca_configure(struct fore200e* fore200e)
{
struct pci_dev* pci_dev = (struct pci_dev*)fore200e->bus_dev;
fore200e_pca_configure(struct fore200e* fore200e)
{
struct pci_dev* pci_dev = (struct pci_dev*)fore200e->bus_dev;
@@
-1176,7
+1174,7
@@
fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
return -ENOMEM;
}
return -ENOMEM;
}
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
#ifdef FORE200E_52BYTE_AAL0_SDU
if (cell_header) {
#ifdef FORE200E_52BYTE_AAL0_SDU
if (cell_header) {
@@
-2127,7
+2125,7
@@
fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags)
}
}
-static int __init
+static int __
dev
init
fore200e_irq_request(struct fore200e* fore200e)
{
if (request_irq(fore200e->irq, fore200e_interrupt, SA_SHIRQ, fore200e->name, fore200e->atm_dev) < 0) {
fore200e_irq_request(struct fore200e* fore200e)
{
if (request_irq(fore200e->irq, fore200e_interrupt, SA_SHIRQ, fore200e->name, fore200e->atm_dev) < 0) {
@@
-2150,7
+2148,7
@@
fore200e_irq_request(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_get_esi(struct fore200e* fore200e)
{
struct prom_data* prom = fore200e_kmalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
fore200e_get_esi(struct fore200e* fore200e)
{
struct prom_data* prom = fore200e_kmalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
@@
-2182,7
+2180,7
@@
fore200e_get_esi(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_alloc_rx_buf(struct fore200e* fore200e)
{
int scheme, magn, nbr, size, i;
fore200e_alloc_rx_buf(struct fore200e* fore200e)
{
int scheme, magn, nbr, size, i;
@@
-2247,7
+2245,7
@@
fore200e_alloc_rx_buf(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_init_bs_queue(struct fore200e* fore200e)
{
int scheme, magn, i;
fore200e_init_bs_queue(struct fore200e* fore200e)
{
int scheme, magn, i;
@@
-2310,7
+2308,7
@@
fore200e_init_bs_queue(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_init_rx_queue(struct fore200e* fore200e)
{
struct host_rxq* rxq = &fore200e->host_rxq;
fore200e_init_rx_queue(struct fore200e* fore200e)
{
struct host_rxq* rxq = &fore200e->host_rxq;
@@
-2370,7
+2368,7
@@
fore200e_init_rx_queue(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_init_tx_queue(struct fore200e* fore200e)
{
struct host_txq* txq = &fore200e->host_txq;
fore200e_init_tx_queue(struct fore200e* fore200e)
{
struct host_txq* txq = &fore200e->host_txq;
@@
-2433,7
+2431,7
@@
fore200e_init_tx_queue(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_init_cmd_queue(struct fore200e* fore200e)
{
struct host_cmdq* cmdq = &fore200e->host_cmdq;
fore200e_init_cmd_queue(struct fore200e* fore200e)
{
struct host_cmdq* cmdq = &fore200e->host_cmdq;
@@
-2489,7
+2487,7
@@
fore200e_param_bs_queue(struct fore200e* fore200e,
}
}
-static int __init
+static int __
dev
init
fore200e_initialize(struct fore200e* fore200e)
{
struct cp_queues __iomem * cpq;
fore200e_initialize(struct fore200e* fore200e)
{
struct cp_queues __iomem * cpq;
@@
-2541,7
+2539,7
@@
fore200e_initialize(struct fore200e* fore200e)
}
}
-static void __init
+static void __
dev
init
fore200e_monitor_putc(struct fore200e* fore200e, char c)
{
struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
fore200e_monitor_putc(struct fore200e* fore200e, char c)
{
struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
@@
-2553,7
+2551,7
@@
fore200e_monitor_putc(struct fore200e* fore200e, char c)
}
}
-static int __init
+static int __
dev
init
fore200e_monitor_getc(struct fore200e* fore200e)
{
struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
fore200e_monitor_getc(struct fore200e* fore200e)
{
struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
@@
-2578,7
+2576,7
@@
fore200e_monitor_getc(struct fore200e* fore200e)
}
}
-static void __init
+static void __
dev
init
fore200e_monitor_puts(struct fore200e* fore200e, char* str)
{
while (*str) {
fore200e_monitor_puts(struct fore200e* fore200e, char* str)
{
while (*str) {
@@
-2593,7
+2591,7
@@
fore200e_monitor_puts(struct fore200e* fore200e, char* str)
}
}
-static int __init
+static int __
dev
init
fore200e_start_fw(struct fore200e* fore200e)
{
int ok;
fore200e_start_fw(struct fore200e* fore200e)
{
int ok;
@@
-2624,7
+2622,7
@@
fore200e_start_fw(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_load_fw(struct fore200e* fore200e)
{
u32* fw_data = (u32*) fore200e->bus->fw_data;
fore200e_load_fw(struct fore200e* fore200e)
{
u32* fw_data = (u32*) fore200e->bus->fw_data;
@@
-2650,7
+2648,7
@@
fore200e_load_fw(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_register(struct fore200e* fore200e)
{
struct atm_dev* atm_dev;
fore200e_register(struct fore200e* fore200e)
{
struct atm_dev* atm_dev;
@@
-2677,7
+2675,7
@@
fore200e_register(struct fore200e* fore200e)
}
}
-static int __init
+static int __
dev
init
fore200e_init(struct fore200e* fore200e)
{
if (fore200e_register(fore200e) < 0)
fore200e_init(struct fore200e* fore200e)
{
if (fore200e_register(fore200e) < 0)
@@
-2723,7
+2721,7
@@
fore200e_init(struct fore200e* fore200e)
return -EBUSY;
fore200e_supply(fore200e);
return -EBUSY;
fore200e_supply(fore200e);
-
+
/* all done, board initialization is now complete */
fore200e->state = FORE200E_STATE_COMPLETE;
return 0;
/* all done, board initialization is now complete */
fore200e->state = FORE200E_STATE_COMPLETE;
return 0;