From b659e78c781cc47af07158f21b15b18e0b01c90d Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Thu, 22 Jan 2004 16:13:27 -0800 Subject: [PATCH] [PATCH] Remove useless cruft from ATM HE driver. Echoing changes done in 2.4. (It now has a pci_pool_create backport). --- drivers/atm/he.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 91cb2893aad9e..2df0ebfb7fac4 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -109,10 +109,6 @@ typedef void irqreturn_t; #define pci_get_drvdata(pci_dev) (pci_dev)->driver_data #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 "suni.h" @@ -785,7 +781,7 @@ he_init_group(struct he_dev *he_dev, int group) /* small buffer pool */ #ifdef USE_RBPS_POOL 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) { hprintk("unable to create rbps pages\n"); return -ENOMEM; @@ -849,7 +845,7 @@ he_init_group(struct he_dev *he_dev, int group) /* large buffer pool */ #ifdef USE_RBPL_POOL 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) { hprintk("unable to create rbpl pool\n"); return -ENOMEM; @@ -1475,7 +1471,7 @@ he_start(struct atm_dev *dev) #ifdef USE_TPD_POOL 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) { hprintk("unable to create tpd pci_pool\n"); return -ENOMEM; @@ -1986,8 +1982,7 @@ he_service_tbrq(struct he_dev *he_dev, int group) TBRQ_MULTIPLE(he_dev->tbrq_head) ? " MULTIPLE" : ""); #ifdef USE_TPD_POOL tpd = NULL; - p = &he_dev->outstanding_tpds; - while ((p = p->next) != &he_dev->outstanding_tpds) { + list_for_each(p, &he_dev->outstanding_tpds) { struct he_tpd *__tpd = list_entry(p, struct he_tpd, entry); if (TPD_ADDR(__tpd->status) == TBRQ_TPD(he_dev->tbrq_head)) { tpd = __tpd; -- 2.53.0