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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
scsi
/
aic7xxx_old.c
diff --git
a/drivers/scsi/aic7xxx_old.c
b/drivers/scsi/aic7xxx_old.c
index
993e2d6
..
3d61496
100644
(file)
--- a/
drivers/scsi/aic7xxx_old.c
+++ b/
drivers/scsi/aic7xxx_old.c
@@
-239,7
+239,7
@@
#include <linux/smp.h>
#include <linux/interrupt.h>
#include "scsi.h"
#include <linux/smp.h>
#include <linux/interrupt.h>
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include "aic7xxx_old/aic7xxx.h"
#include "aic7xxx_old/sequencer.h"
#include "aic7xxx_old/aic7xxx.h"
#include "aic7xxx_old/sequencer.h"
@@
-254,9
+254,6
@@
#define AIC7XXX_C_VERSION "5.2.6"
#define AIC7XXX_C_VERSION "5.2.6"
-#define NUMBER(arr) (sizeof(arr) / sizeof(arr[0]))
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define ALL_TARGETS -1
#define ALL_CHANNELS -1
#define ALL_LUNS -1
#define ALL_TARGETS -1
#define ALL_CHANNELS -1
#define ALL_LUNS -1
@@
-1376,7
+1373,7
@@
aic7xxx_setup(char *s)
while ((p = strsep(&s, ",.")) != NULL)
{
while ((p = strsep(&s, ",.")) != NULL)
{
- for (i = 0; i <
NUMBER
(options); i++)
+ for (i = 0; i <
ARRAY_SIZE
(options); i++)
{
n = strlen(options[i].name);
if (!strncmp(options[i].name, p, n))
{
n = strlen(options[i].name);
if (!strncmp(options[i].name, p, n))
@@
-1423,7
+1420,7
@@
aic7xxx_setup(char *s)
else if (instance >= 0)
instance++;
if ( (device >= MAX_TARGETS) ||
else if (instance >= 0)
instance++;
if ( (device >= MAX_TARGETS) ||
- (instance >=
NUMBER
(aic7xxx_tag_info)) )
+ (instance >=
ARRAY_SIZE
(aic7xxx_tag_info)) )
done = TRUE;
tok++;
if (!done)
done = TRUE;
tok++;
if (!done)
@@
-1447,7
+1444,7
@@
aic7xxx_setup(char *s)
}
}
if ( (instance >= 0) && (device >= 0) &&
}
}
if ( (instance >= 0) && (device >= 0) &&
- (instance <
NUMBER
(aic7xxx_tag_info)) &&
+ (instance <
ARRAY_SIZE
(aic7xxx_tag_info)) &&
(device < MAX_TARGETS) )
aic7xxx_tag_info[instance].tag_commands[device] =
simple_strtoul(tok, NULL, 0) & 0xff;
(device < MAX_TARGETS) )
aic7xxx_tag_info[instance].tag_commands[device] =
simple_strtoul(tok, NULL, 0) & 0xff;
@@
-1658,7
+1655,7
@@
aic7xxx_download_instr(struct aic7xxx_host *p, int instrptr,
{
int end_addr;
{
int end_addr;
- end_addr =
MIN(
address, skip_addr);
+ end_addr =
min_t(int,
address, skip_addr);
address_offset += end_addr - i;
i = skip_addr;
}
address_offset += end_addr - i;
i = skip_addr;
}
@@
-1884,7
+1881,7
@@
aic7xxx_find_syncrate(struct aic7xxx_host *p, unsigned int *period,
if(!(p->features & AHC_ULTRA3))
{
*options = 0;
if(!(p->features & AHC_ULTRA3))
{
*options = 0;
- maxsync =
MAX(
maxsync, AHC_SYNCRATE_ULTRA2);
+ maxsync =
max_t(unsigned int,
maxsync, AHC_SYNCRATE_ULTRA2);
}
break;
case MSG_EXT_PPR_OPTION_DT_CRC_QUICK:
}
break;
case MSG_EXT_PPR_OPTION_DT_CRC_QUICK:
@@
-1892,7
+1889,7
@@
aic7xxx_find_syncrate(struct aic7xxx_host *p, unsigned int *period,
if(!(p->features & AHC_ULTRA3))
{
*options = 0;
if(!(p->features & AHC_ULTRA3))
{
*options = 0;
- maxsync =
MAX(
maxsync, AHC_SYNCRATE_ULTRA2);
+ maxsync =
max_t(unsigned int,
maxsync, AHC_SYNCRATE_ULTRA2);
}
else
{
}
else
{
@@
-1916,7
+1913,7
@@
aic7xxx_find_syncrate(struct aic7xxx_host *p, unsigned int *period,
break;
default:
*options = 0;
break;
default:
*options = 0;
- maxsync =
MAX(
maxsync, AHC_SYNCRATE_ULTRA2);
+ maxsync =
max_t(unsigned int,
maxsync, AHC_SYNCRATE_ULTRA2);
break;
}
syncrate = &aic7xxx_syncrates[maxsync];
break;
}
syncrate = &aic7xxx_syncrates[maxsync];
@@
-2057,7
+2054,7
@@
aic7xxx_validate_offset(struct aic7xxx_host *p,
else
maxoffset = MAX_OFFSET_8BIT;
}
else
maxoffset = MAX_OFFSET_8BIT;
}
- *offset =
MIN
(*offset, maxoffset);
+ *offset =
min
(*offset, maxoffset);
}
/*+F*************************************************************************
}
/*+F*************************************************************************
@@
-2570,7
+2567,7
@@
aic7xxx_allocate_scb(struct aic7xxx_host *p)
break;
}
}
break;
}
}
- scb_count =
MIN
( (i-1), p->scb_data->maxscbs - p->scb_data->numscbs);
+ scb_count =
min
( (i-1), p->scb_data->maxscbs - p->scb_data->numscbs);
scb_ap = (struct aic7xxx_scb *)kmalloc(sizeof (struct aic7xxx_scb) * scb_count
+ sizeof(struct aic7xxx_scb_dma), GFP_ATOMIC);
if (scb_ap == NULL)
scb_ap = (struct aic7xxx_scb *)kmalloc(sizeof (struct aic7xxx_scb) * scb_count
+ sizeof(struct aic7xxx_scb_dma), GFP_ATOMIC);
if (scb_ap == NULL)
@@
-4884,7
+4881,7
@@
aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
}
break;
}
break;
-#if AIC7XXX_NOT_YET
+#if
def
AIC7XXX_NOT_YET
case TRACEPOINT2:
{
printk(INFO_LEAD "Tracepoint #2 reached.\n", p->host_no,
case TRACEPOINT2:
{
printk(INFO_LEAD "Tracepoint #2 reached.\n", p->host_no,
@@
-5042,7
+5039,7
@@
aic7xxx_parse_msg(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
if(p->user[tindex].offset)
{
aic_dev->needsdtr_copy = 1;
if(p->user[tindex].offset)
{
aic_dev->needsdtr_copy = 1;
- aic_dev->goal.period =
MAX(
10,p->user[tindex].period);
+ aic_dev->goal.period =
max_t(unsigned char,
10,p->user[tindex].period);
if(p->features & AHC_ULTRA2)
{
aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
if(p->features & AHC_ULTRA2)
{
aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
@@
-5086,8
+5083,8
@@
aic7xxx_parse_msg(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
* the device isn't allowed to send values greater than the ones
* we first sent to it.
*/
* the device isn't allowed to send values greater than the ones
* we first sent to it.
*/
- new_period =
MAX(
period, aic_dev->goal.period);
- new_offset =
MIN(
offset, aic_dev->goal.offset);
+ new_period =
max_t(unsigned int,
period, aic_dev->goal.period);
+ new_offset =
min_t(unsigned int,
offset, aic_dev->goal.offset);
}
/*
}
/*
@@
-5208,7
+5205,7
@@
aic7xxx_parse_msg(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
if(p->user[tindex].offset)
{
aic_dev->needsdtr_copy = 1;
if(p->user[tindex].offset)
{
aic_dev->needsdtr_copy = 1;
- aic_dev->goal.period =
MAX(10,
p->user[tindex].period);
+ aic_dev->goal.period =
max_t(unsigned char, 10,
p->user[tindex].period);
if(p->features & AHC_ULTRA2)
{
aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
if(p->features & AHC_ULTRA2)
{
aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
@@
-6413,7
+6410,7
@@
aic7xxx_isr(int irq, void *dev_id, struct pt_regs *regs)
unsigned char errno = aic_inb(p, ERROR);
printk(KERN_ERR "(scsi%d) BRKADRINT error(0x%x):\n", p->host_no, errno);
unsigned char errno = aic_inb(p, ERROR);
printk(KERN_ERR "(scsi%d) BRKADRINT error(0x%x):\n", p->host_no, errno);
- for (i = 0; i <
NUMBER
(hard_error); i++)
+ for (i = 0; i <
ARRAY_SIZE
(hard_error); i++)
{
if (errno & hard_error[i].errno)
{
{
if (errno & hard_error[i].errno)
{
@@
-6562,7
+6559,7
@@
aic7xxx_init_transinfo(struct aic7xxx_host *p, struct aic_dev_data *aic_dev)
else
{
aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
else
{
aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
- aic_dev->goal.period =
MAX(
10, aic_dev->goal.period);
+ aic_dev->goal.period =
max_t(unsigned char,
10, aic_dev->goal.period);
aic_dev->goal.options = 0;
}
}
aic_dev->goal.options = 0;
}
}
@@
-6673,7
+6670,7
@@
aic7xxx_device_queue_depth(struct aic7xxx_host *p, Scsi_Device *device)
}
else
{
}
else
{
- if (p->instance >=
NUMBER
(aic7xxx_tag_info))
+ if (p->instance >=
ARRAY_SIZE
(aic7xxx_tag_info))
{
static int print_warning = TRUE;
if(print_warning)
{
static int print_warning = TRUE;
if(print_warning)
@@
-6850,7
+6847,7
@@
aic7xxx_probe(int slot, int base, ahc_flag_type *flags)
buf[i] = inb(base + i);
}
buf[i] = inb(base + i);
}
- for (i = 0; i <
NUMBER
(AIC7xxx); i++)
+ for (i = 0; i <
ARRAY_SIZE
(AIC7xxx); i++)
{
/*
* Signature match on enabled card?
{
/*
* Signature match on enabled card?
@@
-9199,7
+9196,7
@@
aic7xxx_detect(Scsi_Host_Template *template)
unsigned int devconfig, i, oldverbose;
struct pci_dev *pdev = NULL;
unsigned int devconfig, i, oldverbose;
struct pci_dev *pdev = NULL;
- for (i = 0; i <
NUMBER
(aic_pdevs); i++)
+ for (i = 0; i <
ARRAY_SIZE
(aic_pdevs); i++)
{
pdev = NULL;
while ((pdev = pci_find_device(aic_pdevs[i].vendor_id,
{
pdev = NULL;
while ((pdev = pci_find_device(aic_pdevs[i].vendor_id,
@@
-9338,7
+9335,7
@@
aic7xxx_detect(Scsi_Host_Template *template)
printk(KERN_INFO "aic7xxx: MMAPed I/O failed, reverting to "
"Programmed I/O.\n");
iounmap((void *) (((unsigned long) temp_p->maddr) & PAGE_MASK));
printk(KERN_INFO "aic7xxx: MMAPed I/O failed, reverting to "
"Programmed I/O.\n");
iounmap((void *) (((unsigned long) temp_p->maddr) & PAGE_MASK));
- temp_p->maddr =
0
;
+ temp_p->maddr =
NULL
;
if(temp_p->base == 0)
{
printk("aic7xxx: <%s> at PCI %d/%d/%d\n",
if(temp_p->base == 0)
{
printk("aic7xxx: <%s> at PCI %d/%d/%d\n",
@@
-9678,7
+9675,9
@@
aic7xxx_detect(Scsi_Host_Template *template)
found++;
continue;
skip_pci_controller:
found++;
continue;
skip_pci_controller:
+#ifdef CONFIG_PCI
pci_release_regions(temp_p->pdev);
pci_release_regions(temp_p->pdev);
+#endif
kfree(temp_p);
} /* Found an Adaptec PCI device. */
else /* Well, we found one, but we couldn't get any memory */
kfree(temp_p);
} /* Found an Adaptec PCI device. */
else /* Well, we found one, but we couldn't get any memory */
@@
-9698,7
+9697,7
@@
skip_pci_controller:
* EISA/VL-bus card signature probe.
*/
slot = MINSLOT;
* EISA/VL-bus card signature probe.
*/
slot = MINSLOT;
- while ( (slot <= MAXSLOT) &&
+ while ( (slot <= MAXSLOT) &&
!(aic7xxx_no_probe) )
{
base = SLOTBASE(slot) + MINREG;
!(aic7xxx_no_probe) )
{
base = SLOTBASE(slot) + MINREG;
@@
-9744,7
+9743,7
@@
skip_pci_controller:
temp_p->pause = hcntrl | PAUSE | INTEN;
temp_p->base = base;
temp_p->mbase = 0;
temp_p->pause = hcntrl | PAUSE | INTEN;
temp_p->base = base;
temp_p->mbase = 0;
- temp_p->maddr =
0
;
+ temp_p->maddr =
NULL
;
temp_p->pci_bus = 0;
temp_p->pci_device_fn = slot;
aic_outb(temp_p, hcntrl | PAUSE, HCNTRL);
temp_p->pci_bus = 0;
temp_p->pci_device_fn = slot;
aic_outb(temp_p, hcntrl | PAUSE, HCNTRL);
@@
-10097,7
+10096,7
@@
skip_pci_controller:
int i;
left = found;
int i;
left = found;
- for (i=0; i<
NUMBER
(sort_list); i++)
+ for (i=0; i<
ARRAY_SIZE
(sort_list); i++)
{
temp_p = sort_list[i];
while(temp_p != NULL)
{
temp_p = sort_list[i];
while(temp_p != NULL)
@@
-10970,8
+10969,10
@@
aic7xxx_release(struct Scsi_Host *host)
#endif /* MMAPIO */
if(!p->pdev)
release_region(p->base, MAXREG - MINREG);
#endif /* MMAPIO */
if(!p->pdev)
release_region(p->base, MAXREG - MINREG);
+#ifdef CONFIG_PCI
else
pci_release_regions(p->pdev);
else
pci_release_regions(p->pdev);
+#endif
prev = NULL;
next = first_aic7xxx;
while(next != NULL)
prev = NULL;
next = first_aic7xxx;
while(next != NULL)