Commit b659e78c authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] Remove useless cruft from ATM HE driver.

Echoing changes done in 2.4. (It now has a pci_pool_create backport).
parent 1ed0cdc2
...@@ -109,10 +109,6 @@ typedef void irqreturn_t; ...@@ -109,10 +109,6 @@ typedef void irqreturn_t;
#define pci_get_drvdata(pci_dev) (pci_dev)->driver_data #define pci_get_drvdata(pci_dev) (pci_dev)->driver_data
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)
#define pci_pool_create(a, b, c, d, e) pci_pool_create(a, b, c, d, e, SLAB_KERNEL)
#endif
#include "he.h" #include "he.h"
#include "suni.h" #include "suni.h"
...@@ -785,7 +781,7 @@ he_init_group(struct he_dev *he_dev, int group) ...@@ -785,7 +781,7 @@ he_init_group(struct he_dev *he_dev, int group)
/* small buffer pool */ /* small buffer pool */
#ifdef USE_RBPS_POOL #ifdef USE_RBPS_POOL
he_dev->rbps_pool = pci_pool_create("rbps", he_dev->pci_dev, he_dev->rbps_pool = pci_pool_create("rbps", he_dev->pci_dev,
CONFIG_RBPS_BUFSIZE, 8, 0); CONFIG_RBPS_BUFSIZE, 8, 0, SLAB_KERNEL);
if (he_dev->rbps_pool == NULL) { if (he_dev->rbps_pool == NULL) {
hprintk("unable to create rbps pages\n"); hprintk("unable to create rbps pages\n");
return -ENOMEM; return -ENOMEM;
...@@ -849,7 +845,7 @@ he_init_group(struct he_dev *he_dev, int group) ...@@ -849,7 +845,7 @@ he_init_group(struct he_dev *he_dev, int group)
/* large buffer pool */ /* large buffer pool */
#ifdef USE_RBPL_POOL #ifdef USE_RBPL_POOL
he_dev->rbpl_pool = pci_pool_create("rbpl", he_dev->pci_dev, he_dev->rbpl_pool = pci_pool_create("rbpl", he_dev->pci_dev,
CONFIG_RBPL_BUFSIZE, 8, 0); CONFIG_RBPL_BUFSIZE, 8, 0, SLAB_KERNEL);
if (he_dev->rbpl_pool == NULL) { if (he_dev->rbpl_pool == NULL) {
hprintk("unable to create rbpl pool\n"); hprintk("unable to create rbpl pool\n");
return -ENOMEM; return -ENOMEM;
...@@ -1475,7 +1471,7 @@ he_start(struct atm_dev *dev) ...@@ -1475,7 +1471,7 @@ he_start(struct atm_dev *dev)
#ifdef USE_TPD_POOL #ifdef USE_TPD_POOL
he_dev->tpd_pool = pci_pool_create("tpd", he_dev->pci_dev, he_dev->tpd_pool = pci_pool_create("tpd", he_dev->pci_dev,
sizeof(struct he_tpd), TPD_ALIGNMENT, 0); sizeof(struct he_tpd), TPD_ALIGNMENT, 0, SLAB_KERNEL);
if (he_dev->tpd_pool == NULL) { if (he_dev->tpd_pool == NULL) {
hprintk("unable to create tpd pci_pool\n"); hprintk("unable to create tpd pci_pool\n");
return -ENOMEM; return -ENOMEM;
...@@ -1986,8 +1982,7 @@ he_service_tbrq(struct he_dev *he_dev, int group) ...@@ -1986,8 +1982,7 @@ he_service_tbrq(struct he_dev *he_dev, int group)
TBRQ_MULTIPLE(he_dev->tbrq_head) ? " MULTIPLE" : ""); TBRQ_MULTIPLE(he_dev->tbrq_head) ? " MULTIPLE" : "");
#ifdef USE_TPD_POOL #ifdef USE_TPD_POOL
tpd = NULL; tpd = NULL;
p = &he_dev->outstanding_tpds; list_for_each(p, &he_dev->outstanding_tpds) {
while ((p = p->next) != &he_dev->outstanding_tpds) {
struct he_tpd *__tpd = list_entry(p, struct he_tpd, entry); struct he_tpd *__tpd = list_entry(p, struct he_tpd, entry);
if (TPD_ADDR(__tpd->status) == TBRQ_TPD(he_dev->tbrq_head)) { if (TPD_ADDR(__tpd->status) == TBRQ_TPD(he_dev->tbrq_head)) {
tpd = __tpd; tpd = __tpd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment