git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
sn
/
ioc3.c
diff --git
a/drivers/sn/ioc3.c
b/drivers/sn/ioc3.c
index
6c7e035
..
4bd05a0
100644
(file)
--- a/
drivers/sn/ioc3.c
+++ b/
drivers/sn/ioc3.c
@@
-7,10
+7,10
@@
* Pat Gefre <pfg@sgi.com> - IOC3 serial port IRQ demuxer
*/
* Pat Gefre <pfg@sgi.com> - IOC3 serial port IRQ demuxer
*/
+#include <linux/config.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
@@
-25,7
+25,7
@@
static DECLARE_RWSEM(ioc3_devices_rwsem);
static struct ioc3_submodule *ioc3_submodules[IOC3_MAX_SUBMODULES];
static struct ioc3_submodule *ioc3_ethernet;
static struct ioc3_submodule *ioc3_submodules[IOC3_MAX_SUBMODULES];
static struct ioc3_submodule *ioc3_ethernet;
-static
DEFINE_RWLOCK(ioc3_submodules_lock)
;
+static
rwlock_t ioc3_submodules_lock = RW_LOCK_UNLOCKED
;
/* NIC probing code */
/* NIC probing code */
@@
-619,9
+619,9
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
pci_set_master(pdev);
#ifdef USE_64BIT_DMA
pci_set_master(pdev);
#ifdef USE_64BIT_DMA
- ret = pci_set_dma_mask(pdev,
DMA_64BIT_MASK
);
+ ret = pci_set_dma_mask(pdev,
0xffffffffffffffffULL
);
if (!ret) {
if (!ret) {
- ret = pci_set_consistent_dma_mask(pdev,
DMA_64BIT_MASK
);
+ ret = pci_set_consistent_dma_mask(pdev,
0xffffffffffffffffULL
);
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",
@@
-706,7
+706,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
writel(~0, &idd->vma->eisr);
idd->dual_irq = 1;
writel(~0, &idd->vma->eisr);
idd->dual_irq = 1;
- if (!request_irq(pdev->irq, ioc3_intr_eth,
IRQF_SHARED
,
+ if (!request_irq(pdev->irq, ioc3_intr_eth,
SA_SHIRQ
,
"ioc3-eth", (void *)idd)) {
idd->irq_eth = pdev->irq;
} else {
"ioc3-eth", (void *)idd)) {
idd->irq_eth = pdev->irq;
} else {
@@
-714,7
+714,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
"%s : request_irq fails for IRQ 0x%x\n ",
__FUNCTION__, pdev->irq);
}
"%s : request_irq fails for IRQ 0x%x\n ",
__FUNCTION__, pdev->irq);
}
- if (!request_irq(pdev->irq+2, ioc3_intr_io,
IRQF_SHARED
,
+ if (!request_irq(pdev->irq+2, ioc3_intr_io,
SA_SHIRQ
,
"ioc3-io", (void *)idd)) {
idd->irq_io = pdev->irq+2;
} else {
"ioc3-io", (void *)idd)) {
idd->irq_io = pdev->irq+2;
} else {
@@
-723,7
+723,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
__FUNCTION__, pdev->irq+2);
}
} else {
__FUNCTION__, pdev->irq+2);
}
} else {
- if (!request_irq(pdev->irq, ioc3_intr_io,
IRQF_SHARED
,
+ if (!request_irq(pdev->irq, ioc3_intr_io,
SA_SHIRQ
,
"ioc3", (void *)idd)) {
idd->irq_io = pdev->irq;
} else {
"ioc3", (void *)idd)) {
idd->irq_io = pdev->irq;
} else {