From: Johannes Berg <johannes@sipsolutions.net>
To: "Luis R. Rodriguez" <mcgrof@gmail.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: [PATCH] compat: simplify pci_try_set_mwi
Date: Wed, 22 Dec 2010 21:37:20 +0100 [thread overview]
Message-ID: <1293050240.3531.25.camel@jlt3.sipsolutions.net> (raw)
From: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
compat/compat-2.6.23.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/compat/compat-2.6.23.c b/compat/compat-2.6.23.c
index 87f2a8c..67d0075 100644
--- a/compat/compat-2.6.23.c
+++ b/compat/compat-2.6.23.c
@@ -217,14 +217,6 @@ void __dev_set_rx_mode(struct net_device *dev)
dev->set_multicast_list(dev);
}
-#ifndef HAVE_PCI_SET_MWI
-int pci_try_set_mwi(struct pci_dev *dev)
-{
- return 0;
-}
-EXPORT_SYMBOL(pci_try_set_mwi);
-#else
-
/**
* pci_try_set_mwi - enables memory-write-invalidate PCI transaction
* @dev: the PCI device for which MWI is enabled
@@ -236,7 +228,10 @@ EXPORT_SYMBOL(pci_try_set_mwi);
*/
int pci_try_set_mwi(struct pci_dev *dev)
{
- int rc = pci_set_mwi(dev);
+ int rc = 0;
+#ifdef HAVE_PCI_SET_MWI
+ rc = pci_set_mwi(dev);
+#endif
return rc;
}
EXPORT_SYMBOL(pci_try_set_mwi);
--
1.7.2.3
reply other threads:[~2010-12-22 20:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1293050240.3531.25.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@gmail.com \
/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