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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
NCR_D700.c
diff --git
a/drivers/scsi/NCR_D700.c
b/drivers/scsi/NCR_D700.c
index
e993a7b
..
9859cd1
100644
(file)
--- a/
drivers/scsi/NCR_D700.c
+++ b/
drivers/scsi/NCR_D700.c
@@
-114,7
+114,7
@@
MODULE_DESCRIPTION("NCR Dual700 SCSI Driver");
MODULE_LICENSE("GPL");
module_param(NCR_D700, charp, 0);
MODULE_LICENSE("GPL");
module_param(NCR_D700, charp, 0);
-static __u8 __initdata id_array[2*(MCA_MAX_SLOT_NR + 1)] =
+static __u8 __
dev
initdata id_array[2*(MCA_MAX_SLOT_NR + 1)] =
{ [0 ... 2*(MCA_MAX_SLOT_NR + 1)-1] = 7 };
#ifdef MODULE
{ [0 ... 2*(MCA_MAX_SLOT_NR + 1)-1] = 7 };
#ifdef MODULE
@@
-173,7
+173,7
@@
struct NCR_D700_private {
char pad;
};
char pad;
};
-static int
+static int
__devinit
NCR_D700_probe_one(struct NCR_D700_private *p, int siop, int irq,
int slot, u32 region, int differential)
{
NCR_D700_probe_one(struct NCR_D700_private *p, int siop, int irq,
int slot, u32 region, int differential)
{
@@
-218,7
+218,7
@@
NCR_D700_probe_one(struct NCR_D700_private *p, int siop, int irq,
return 0;
detect_failed:
return 0;
detect_failed:
- release_region(
host->base
, 64);
+ release_region(
region
, 64);
region_failed:
kfree(hostdata);
region_failed:
kfree(hostdata);
@@
-226,14
+226,14
@@
NCR_D700_probe_one(struct NCR_D700_private *p, int siop, int irq,
}
static int
}
static int
-NCR_D700_intr(int irq, void *data
, struct pt_regs *regs
)
+NCR_D700_intr(int irq, void *data)
{
struct NCR_D700_private *p = (struct NCR_D700_private *)data;
int i, found = 0;
for (i = 0; i < 2; i++)
if (p->hosts[i] &&
{
struct NCR_D700_private *p = (struct NCR_D700_private *)data;
int i, found = 0;
for (i = 0; i < 2; i++)
if (p->hosts[i] &&
- NCR_700_intr(irq, p->hosts[i]
, regs
) == IRQ_HANDLED)
+ NCR_700_intr(irq, p->hosts[i]) == IRQ_HANDLED)
found++;
return found ? IRQ_HANDLED : IRQ_NONE;
found++;
return found ? IRQ_HANDLED : IRQ_NONE;
@@
-243,7
+243,7
@@
NCR_D700_intr(int irq, void *data, struct pt_regs *regs)
* essentially connectecd to the MCA bus independently, it is easier
* to set them up as two separate host adapters, rather than one
* adapter with two channels */
* essentially connectecd to the MCA bus independently, it is easier
* to set them up as two separate host adapters, rather than one
* adapter with two channels */
-static int
+static int
__devinit
NCR_D700_probe(struct device *dev)
{
struct NCR_D700_private *p;
NCR_D700_probe(struct device *dev)
{
struct NCR_D700_private *p;
@@
-320,7
+320,7
@@
NCR_D700_probe(struct device *dev)
memset(p, '\0', sizeof(*p));
p->dev = dev;
snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id);
memset(p, '\0', sizeof(*p));
p->dev = dev;
snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id);
- if (request_irq(irq, NCR_D700_intr,
SA_SHIRQ
, p->name, p)) {
+ if (request_irq(irq, NCR_D700_intr,
IRQF_SHARED
, p->name, p)) {
printk(KERN_ERR "D700: request_irq failed\n");
kfree(p);
return -EBUSY;
printk(KERN_ERR "D700: request_irq failed\n");
kfree(p);
return -EBUSY;
@@
-329,7
+329,7
@@
NCR_D700_probe(struct device *dev)
for (i = 0; i < 2; i++) {
int err;
for (i = 0; i < 2; i++) {
int err;
- if ((err = NCR_D700_probe_one(p, i,
slot, irq
,
+ if ((err = NCR_D700_probe_one(p, i,
irq, slot
,
offset_addr + (0x80 * i),
differential)) != 0)
printk("D700: SIOP%d: probe failed, error = %d\n",
offset_addr + (0x80 * i),
differential)) != 0)
printk("D700: SIOP%d: probe failed, error = %d\n",
@@
-349,7
+349,7
@@
NCR_D700_probe(struct device *dev)
return 0;
}
return 0;
}
-static void
+static void
__devexit
NCR_D700_remove_one(struct Scsi_Host *host)
{
scsi_remove_host(host);
NCR_D700_remove_one(struct Scsi_Host *host)
{
scsi_remove_host(host);
@@
-359,7
+359,7
@@
NCR_D700_remove_one(struct Scsi_Host *host)
release_region(host->base, 64);
}
release_region(host->base, 64);
}
-static int
+static int
__devexit
NCR_D700_remove(struct device *dev)
{
struct NCR_D700_private *p = dev_get_drvdata(dev);
NCR_D700_remove(struct device *dev)
{
struct NCR_D700_private *p = dev_get_drvdata(dev);
@@
-380,7
+380,7
@@
static struct mca_driver NCR_D700_driver = {
.name = "NCR_D700",
.bus = &mca_bus_type,
.probe = NCR_D700_probe,
.name = "NCR_D700",
.bus = &mca_bus_type,
.probe = NCR_D700_probe,
- .remove =
NCR_D700_remove
,
+ .remove =
__devexit_p(NCR_D700_remove)
,
},
};
},
};