From: davej@redhat.com
To: linux-kernel@vger.kernel.org
Cc: torvalds@osdl.org, akpm@osdl.org
Subject: Remove useless cruft from ATM HE driver.
Date: Fri, 23 Jan 2004 06:35:25 +0000 [thread overview]
Message-ID: <E1Ajuub-0000xS-00@hardwired> (raw)
Echoing changes done in 2.4. (It now has a pci_pool_create backport).
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/atm/he.c linux-2.5/drivers/atm/he.c
--- bk-linus/drivers/atm/he.c 2003-10-17 20:53:48.000000000 +0100
+++ linux-2.5/drivers/atm/he.c 2003-10-21 02:32:37.000000000 +0100
@@ -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
/* 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
/* 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, i
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;
next reply other threads:[~2004-01-23 6:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-23 6:35 davej [this message]
2004-01-23 7:35 ` Remove useless cruft from ATM HE driver Andrew Morton
2004-01-23 7:48 ` Dave Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Ajuub-0000xS-00@hardwired \
--to=davej@redhat.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox