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
/
aic7xxx
/
aic7770.c
diff --git
a/drivers/scsi/aic7xxx/aic7770.c
b/drivers/scsi/aic7xxx/aic7770.c
index
92703bb
..
c4d1723
100644
(file)
--- a/
drivers/scsi/aic7xxx/aic7770.c
+++ b/
drivers/scsi/aic7xxx/aic7770.c
@@
-107,7
+107,7
@@
struct aic7770_identity aic7770_ident_table[] =
ahc_aic7770_EISA_setup
}
};
ahc_aic7770_EISA_setup
}
};
-const int ahc_num_aic7770_devs =
NUM_ELEMENTS
(aic7770_ident_table);
+const int ahc_num_aic7770_devs =
ARRAY_SIZE
(aic7770_ident_table);
struct aic7770_identity *
aic7770_find_device(uint32_t id)
struct aic7770_identity *
aic7770_find_device(uint32_t id)
@@
-126,7
+126,6
@@
aic7770_find_device(uint32_t id)
int
aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
{
int
aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
{
- u_long l;
int error;
int have_seeprom;
u_int hostconf;
int error;
int have_seeprom;
u_int hostconf;
@@
-254,19
+253,12
@@
aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
if (error != 0)
return (error);
if (error != 0)
return (error);
- ahc_list_lock(&l);
- /*
- * Link this softc in with all other ahc instances.
- */
- ahc_softc_insert(ahc);
+ ahc->init_level++;
/*
* Enable the board's BUS drivers
*/
ahc_outb(ahc, BCTL, ENABLE);
/*
* Enable the board's BUS drivers
*/
ahc_outb(ahc, BCTL, ENABLE);
-
- ahc_list_unlock(&l);
-
return (0);
}
return (0);
}