projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
drivers
/
scsi
/
t128.c
diff --git
a/drivers/scsi/t128.c
b/drivers/scsi/t128.c
index
f4b780e
..
a24f661
100644
(file)
--- a/
drivers/scsi/t128.c
+++ b/
drivers/scsi/t128.c
@@
-126,15
+126,15
@@
static struct override {
unsigned long address;
int irq;
static struct override {
unsigned long address;
int irq;
-} overrides
+} overrides
#ifdef T128_OVERRIDE
[] __initdata = T128_OVERRIDE;
#else
#ifdef T128_OVERRIDE
[] __initdata = T128_OVERRIDE;
#else
- [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO},
+ [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO},
{0 ,IRQ_AUTO}, {0, IRQ_AUTO}};
#endif
{0 ,IRQ_AUTO}, {0, IRQ_AUTO}};
#endif
-#define NO_OVERRIDES
(sizeof(overrides) / sizeof(struct override)
)
+#define NO_OVERRIDES
ARRAY_SIZE(overrides
)
static struct base {
unsigned int address;
static struct base {
unsigned int address;
@@
-143,7
+143,7
@@
static struct base {
{ 0xcc000, 0}, { 0xc8000, 0}, { 0xdc000, 0}, { 0xd8000, 0}
};
{ 0xcc000, 0}, { 0xc8000, 0}, { 0xdc000, 0}, { 0xd8000, 0}
};
-#define NO_BASES
(sizeof (bases) / sizeof (struct base)
)
+#define NO_BASES
ARRAY_SIZE(bases
)
static struct signature {
const char *string;
static struct signature {
const char *string;
@@
-152,7
+152,7
@@
static struct signature {
{"TSROM: SCSI BIOS, Version 1.12", 0x36},
};
{"TSROM: SCSI BIOS, Version 1.12", 0x36},
};
-#define NO_SIGNATURES
(sizeof (signatures) / sizeof (struct signature)
)
+#define NO_SIGNATURES
ARRAY_SIZE(signatures
)
/*
* Function : t128_setup(char *str, int *ints)
/*
* Function : t128_setup(char *str, int *ints)
@@
-183,7
+183,7
@@
void __init t128_setup(char *str, int *ints){
}
/*
}
/*
- * Function : int t128_detect(
Scsi_Host_T
emplate * tpnt)
+ * Function : int t128_detect(
struct scsi_host_t
emplate * tpnt)
*
* Purpose : detects and initializes T128,T128F, or T228 controllers
* that were autoprobed, overridden on the LILO command line,
*
* Purpose : detects and initializes T128,T128F, or T228 controllers
* that were autoprobed, overridden on the LILO command line,
@@
-195,7
+195,7
@@
void __init t128_setup(char *str, int *ints){
*
*/
*
*/
-int __init t128_detect(
Scsi_Host_T
emplate * tpnt){
+int __init t128_detect(
struct scsi_host_t
emplate * tpnt){
static int current_override = 0, current_base = 0;
struct Scsi_Host *instance;
unsigned long base;
static int current_override = 0, current_base = 0;
struct Scsi_Host *instance;
unsigned long base;
@@
-430,7
+430,7
@@
MODULE_LICENSE("GPL");
#include "NCR5380.c"
#include "NCR5380.c"
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.name = "Trantor T128/T128F/T228",
.detect = t128_detect,
.release = t128_release,
.name = "Trantor T128/T128F/T228",
.detect = t128_detect,
.release = t128_release,