Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 44923
b: refs/heads/master
c: 1f8a5fb
h: refs/heads/master
i:
  44921: e2e26c2
  44919: 7916db7
v: v3
  • Loading branch information
Adrian Bunk authored and David S. Miller committed Dec 22, 2006
1 parent 0177af8 commit 599ce61
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 99 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 52a91071306c3b129efa6ea2bfe16244b8619cd9
refs/heads/master: 1f8a5fb80e63aab63de81169ab749d73e7509e3f
166 changes: 68 additions & 98 deletions trunk/drivers/atm/fore200e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,25 +172,6 @@ fore200e_irq_itoa(int irq)
}


static void*
fore200e_kmalloc(int size, gfp_t flags)
{
void *chunk = kzalloc(size, flags);

if (!chunk)
printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n", size, flags);

return chunk;
}


static void
fore200e_kfree(void* chunk)
{
kfree(chunk);
}


/* allocate and align a chunk of memory intended to hold the data behing exchanged
between the driver and the adapter (using streaming DVMA) */

Expand All @@ -206,7 +187,7 @@ fore200e_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk, int size, i
chunk->align_size = size;
chunk->direction = direction;

chunk->alloc_addr = fore200e_kmalloc(chunk->alloc_size, GFP_KERNEL | GFP_DMA);
chunk->alloc_addr = kzalloc(chunk->alloc_size, GFP_KERNEL | GFP_DMA);
if (chunk->alloc_addr == NULL)
return -ENOMEM;

Expand All @@ -228,7 +209,7 @@ fore200e_chunk_free(struct fore200e* fore200e, struct chunk* chunk)
{
fore200e->bus->dma_unmap(fore200e, chunk->dma_addr, chunk->dma_size, chunk->direction);

fore200e_kfree(chunk->alloc_addr);
kfree(chunk->alloc_addr);
}


Expand Down Expand Up @@ -882,7 +863,7 @@ fore200e_sba_detect(const struct fore200e_bus* bus, int index)
return NULL;
}

fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);
if (fore200e == NULL)
return NULL;

Expand Down Expand Up @@ -1505,7 +1486,7 @@ fore200e_open(struct atm_vcc *vcc)

spin_unlock_irqrestore(&fore200e->q_lock, flags);

fore200e_vcc = fore200e_kmalloc(sizeof(struct fore200e_vcc), GFP_ATOMIC);
fore200e_vcc = kzalloc(sizeof(struct fore200e_vcc), GFP_ATOMIC);
if (fore200e_vcc == NULL) {
vc_map->vcc = NULL;
return -ENOMEM;
Expand All @@ -1526,7 +1507,7 @@ fore200e_open(struct atm_vcc *vcc)
if (fore200e->available_cell_rate < vcc->qos.txtp.max_pcr) {
up(&fore200e->rate_sf);

fore200e_kfree(fore200e_vcc);
kfree(fore200e_vcc);
vc_map->vcc = NULL;
return -EAGAIN;
}
Expand Down Expand Up @@ -1554,7 +1535,7 @@ fore200e_open(struct atm_vcc *vcc)

fore200e->available_cell_rate += vcc->qos.txtp.max_pcr;

fore200e_kfree(fore200e_vcc);
kfree(fore200e_vcc);
return -EINVAL;
}

Expand Down Expand Up @@ -1630,7 +1611,7 @@ fore200e_close(struct atm_vcc* vcc)
clear_bit(ATM_VF_PARTIAL,&vcc->flags);

ASSERT(fore200e_vcc);
fore200e_kfree(fore200e_vcc);
kfree(fore200e_vcc);
}


Expand Down Expand Up @@ -1831,7 +1812,7 @@ fore200e_getstats(struct fore200e* fore200e)
u32 stats_dma_addr;

if (fore200e->stats == NULL) {
fore200e->stats = fore200e_kmalloc(sizeof(struct stats), GFP_KERNEL | GFP_DMA);
fore200e->stats = kzalloc(sizeof(struct stats), GFP_KERNEL | GFP_DMA);
if (fore200e->stats == NULL)
return -ENOMEM;
}
Expand Down Expand Up @@ -2002,17 +1983,6 @@ fore200e_setloop(struct fore200e* fore200e, int loop_mode)
}


static inline unsigned int
fore200e_swap(unsigned int in)
{
#if defined(__LITTLE_ENDIAN)
return swab32(in);
#else
return in;
#endif
}


static int
fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
{
Expand All @@ -2021,19 +1991,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
if (fore200e_getstats(fore200e) < 0)
return -EIO;

tmp.section_bip = fore200e_swap(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = fore200e_swap(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = fore200e_swap(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = fore200e_swap(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = fore200e_swap(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = fore200e_swap(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = fore200e_swap(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = fore200e_swap(fore200e->stats->aal0.cells_transmitted) +
fore200e_swap(fore200e->stats->aal34.cells_transmitted) +
fore200e_swap(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = fore200e_swap(fore200e->stats->aal0.cells_received) +
fore200e_swap(fore200e->stats->aal34.cells_received) +
fore200e_swap(fore200e->stats->aal5.cells_received);
tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = cpu_to_be32(fore200e->stats->aal0.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = cpu_to_be32(fore200e->stats->aal0.cells_received) +
cpu_to_be32(fore200e->stats->aal34.cells_received) +
cpu_to_be32(fore200e->stats->aal5.cells_received);

if (arg)
return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;
Expand Down Expand Up @@ -2146,15 +2116,15 @@ fore200e_irq_request(struct fore200e* fore200e)
static int __devinit
fore200e_get_esi(struct fore200e* fore200e)
{
struct prom_data* prom = fore200e_kmalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
struct prom_data* prom = kzalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
int ok, i;

if (!prom)
return -ENOMEM;

ok = fore200e->bus->prom_read(fore200e, prom);
if (ok < 0) {
fore200e_kfree(prom);
kfree(prom);
return -EBUSY;
}

Expand All @@ -2169,7 +2139,7 @@ fore200e_get_esi(struct fore200e* fore200e)
fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ];
}

fore200e_kfree(prom);
kfree(prom);

return 0;
}
Expand All @@ -2194,7 +2164,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)
DPRINTK(2, "rx buffers %d / %d are being allocated\n", scheme, magn);

/* allocate the array of receive buffers */
buffer = bsq->buffer = fore200e_kmalloc(nbr * sizeof(struct buffer), GFP_KERNEL);
buffer = bsq->buffer = kzalloc(nbr * sizeof(struct buffer), GFP_KERNEL);

if (buffer == NULL)
return -ENOMEM;
Expand All @@ -2217,7 +2187,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)

while (i > 0)
fore200e_chunk_free(fore200e, &buffer[ --i ].data);
fore200e_kfree(buffer);
kfree(buffer);

return -ENOMEM;
}
Expand Down Expand Up @@ -2736,7 +2706,7 @@ fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent
goto out;
}

fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);
if (fore200e == NULL) {
err = -ENOMEM;
goto out_disable;
Expand Down Expand Up @@ -2999,8 +2969,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" 4b5b:\n"
" crc_header_errors:\t\t%10u\n"
" framing_errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->phy.crc_header_errors),
fore200e_swap(fore200e->stats->phy.framing_errors));
cpu_to_be32(fore200e->stats->phy.crc_header_errors),
cpu_to_be32(fore200e->stats->phy.framing_errors));

if (!left--)
return sprintf(page, "\n"
Expand All @@ -3012,13 +2982,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" path_febe_errors:\t\t%10u\n"
" corr_hcs_errors:\t\t%10u\n"
" ucorr_hcs_errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->oc3.section_bip8_errors),
fore200e_swap(fore200e->stats->oc3.path_bip8_errors),
fore200e_swap(fore200e->stats->oc3.line_bip24_errors),
fore200e_swap(fore200e->stats->oc3.line_febe_errors),
fore200e_swap(fore200e->stats->oc3.path_febe_errors),
fore200e_swap(fore200e->stats->oc3.corr_hcs_errors),
fore200e_swap(fore200e->stats->oc3.ucorr_hcs_errors));
cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),
cpu_to_be32(fore200e->stats->oc3.line_febe_errors),
cpu_to_be32(fore200e->stats->oc3.path_febe_errors),
cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),
cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3029,22 +2999,22 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" vpi no conn:\t\t%10u\n"
" vci out of range:\t\t%10u\n"
" vci no conn:\t\t%10u\n",
fore200e_swap(fore200e->stats->atm.cells_transmitted),
fore200e_swap(fore200e->stats->atm.cells_received),
fore200e_swap(fore200e->stats->atm.vpi_bad_range),
fore200e_swap(fore200e->stats->atm.vpi_no_conn),
fore200e_swap(fore200e->stats->atm.vci_bad_range),
fore200e_swap(fore200e->stats->atm.vci_no_conn));
cpu_to_be32(fore200e->stats->atm.cells_transmitted),
cpu_to_be32(fore200e->stats->atm.cells_received),
cpu_to_be32(fore200e->stats->atm.vpi_bad_range),
cpu_to_be32(fore200e->stats->atm.vpi_no_conn),
cpu_to_be32(fore200e->stats->atm.vci_bad_range),
cpu_to_be32(fore200e->stats->atm.vci_no_conn));

if (!left--)
return sprintf(page,"\n"
" AAL0:\t\t\t cells\n"
" TX:\t\t\t%10u\n"
" RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n",
fore200e_swap(fore200e->stats->aal0.cells_transmitted),
fore200e_swap(fore200e->stats->aal0.cells_received),
fore200e_swap(fore200e->stats->aal0.cells_dropped));
cpu_to_be32(fore200e->stats->aal0.cells_transmitted),
cpu_to_be32(fore200e->stats->aal0.cells_received),
cpu_to_be32(fore200e->stats->aal0.cells_dropped));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3060,15 +3030,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n"
" protocol errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->aal34.cells_transmitted),
fore200e_swap(fore200e->stats->aal34.cells_received),
fore200e_swap(fore200e->stats->aal34.cells_dropped),
fore200e_swap(fore200e->stats->aal34.cells_crc_errors),
fore200e_swap(fore200e->stats->aal34.cells_protocol_errors),
fore200e_swap(fore200e->stats->aal34.cspdus_transmitted),
fore200e_swap(fore200e->stats->aal34.cspdus_received),
fore200e_swap(fore200e->stats->aal34.cspdus_dropped),
fore200e_swap(fore200e->stats->aal34.cspdus_protocol_errors));
cpu_to_be32(fore200e->stats->aal34.cells_transmitted),
cpu_to_be32(fore200e->stats->aal34.cells_received),
cpu_to_be32(fore200e->stats->aal34.cells_dropped),
cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),
cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),
cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal34.cspdus_received),
cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3084,15 +3054,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" dropped:\t\t\t%10u\n"
" CRC errors:\t\t%10u\n"
" protocol errors:\t\t%10u\n",
fore200e_swap(fore200e->stats->aal5.cells_transmitted),
fore200e_swap(fore200e->stats->aal5.cells_received),
fore200e_swap(fore200e->stats->aal5.cells_dropped),
fore200e_swap(fore200e->stats->aal5.congestion_experienced),
fore200e_swap(fore200e->stats->aal5.cspdus_transmitted),
fore200e_swap(fore200e->stats->aal5.cspdus_received),
fore200e_swap(fore200e->stats->aal5.cspdus_dropped),
fore200e_swap(fore200e->stats->aal5.cspdus_crc_errors),
fore200e_swap(fore200e->stats->aal5.cspdus_protocol_errors));
cpu_to_be32(fore200e->stats->aal5.cells_transmitted),
cpu_to_be32(fore200e->stats->aal5.cells_received),
cpu_to_be32(fore200e->stats->aal5.cells_dropped),
cpu_to_be32(fore200e->stats->aal5.congestion_experienced),
cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal5.cspdus_received),
cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),
cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3103,11 +3073,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" large b2:\t\t\t%10u\n"
" RX PDUs:\t\t\t%10u\n"
" TX PDUs:\t\t\t%10lu\n",
fore200e_swap(fore200e->stats->aux.small_b1_failed),
fore200e_swap(fore200e->stats->aux.large_b1_failed),
fore200e_swap(fore200e->stats->aux.small_b2_failed),
fore200e_swap(fore200e->stats->aux.large_b2_failed),
fore200e_swap(fore200e->stats->aux.rpd_alloc_failed),
cpu_to_be32(fore200e->stats->aux.small_b1_failed),
cpu_to_be32(fore200e->stats->aux.large_b1_failed),
cpu_to_be32(fore200e->stats->aux.small_b2_failed),
cpu_to_be32(fore200e->stats->aux.large_b2_failed),
cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),
fore200e->tx_sat);

if (!left--)
Expand Down

0 comments on commit 599ce61

Please sign in to comment.