git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/base/attribute_container.c: use mutex instead of binary semaphore
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
dc395x.c
diff --git
a/drivers/scsi/dc395x.c
b/drivers/scsi/dc395x.c
index
1832452
..
a965ed3
100644
(file)
--- a/
drivers/scsi/dc395x.c
+++ b/
drivers/scsi/dc395x.c
@@
-1219,7
+1219,7
@@
static void dump_register_info(struct AdapterCtlBlk *acb,
srb, srb->cmd, srb->cmd->pid,
srb->cmd->cmnd[0], srb->cmd->device->id,
srb->cmd->device->lun);
srb, srb->cmd, srb->cmd->pid,
srb->cmd->cmnd[0], srb->cmd->device->id,
srb->cmd->device->lun);
- printk(" sglist=%p cnt=%i idx=%i len=%
i
\n",
+ printk(" sglist=%p cnt=%i idx=%i len=%
zu
\n",
srb->segment_x, srb->sg_count, srb->sg_index,
srb->total_xfer_length);
printk(" state=0x%04x status=0x%02x phase=0x%02x (%sconn.)\n",
srb->segment_x, srb->sg_count, srb->sg_index,
srb->total_xfer_length);
printk(" state=0x%04x status=0x%02x phase=0x%02x (%sconn.)\n",
@@
-1813,10
+1813,9
@@
static void dc395x_handle_interrupt(struct AdapterCtlBlk *acb,
}
}
-static irqreturn_t dc395x_interrupt(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t dc395x_interrupt(int irq, void *dev_id)
{
{
- struct AdapterCtlBlk *acb =
(struct AdapterCtlBlk *)
dev_id;
+ struct AdapterCtlBlk *acb = dev_id;
u16 scsi_status;
u8 dma_status;
irqreturn_t handled = IRQ_NONE;
u16 scsi_status;
u8 dma_status;
irqreturn_t handled = IRQ_NONE;
@@
-3771,7
+3770,7
@@
static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
* @target: The target for the new device.
* @lun: The lun for the new device.
*
* @target: The target for the new device.
* @lun: The lun for the new device.
*
- * Return the new device if succes
ful
l or NULL on failure.
+ * Return the new device if succes
sfu
l or NULL on failure.
**/
static struct DeviceCtlBlk *device_alloc(struct AdapterCtlBlk *acb,
u8 target, u8 lun)
**/
static struct DeviceCtlBlk *device_alloc(struct AdapterCtlBlk *acb,
u8 target, u8 lun)
@@
-4320,7
+4319,7
@@
static int __devinit adapter_sg_tables_alloc(struct AdapterCtlBlk *acb)
dprintkdbg(DBG_1, "Allocate %i pages for SG tables\n", pages);
while (pages--) {
dprintkdbg(DBG_1, "Allocate %i pages for SG tables\n", pages);
while (pages--) {
- ptr =
(struct SGentry *)
kmalloc(PAGE_SIZE, GFP_KERNEL);
+ ptr = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!ptr) {
adapter_sg_tables_free(acb);
return 1;
if (!ptr) {
adapter_sg_tables_free(acb);
return 1;
@@
-4562,7
+4561,7
@@
static int __devinit adapter_init(struct AdapterCtlBlk *acb,
acb->io_port_base = io_port;
acb->io_port_len = io_port_len;
acb->io_port_base = io_port;
acb->io_port_len = io_port_len;
- if (request_irq(irq, dc395x_interrupt,
SA_SHIRQ
, DC395X_NAME, acb)) {
+ if (request_irq(irq, dc395x_interrupt,
IRQF_SHARED
, DC395X_NAME, acb)) {
/* release the region we just claimed */
dprintkl(KERN_INFO, "Failed to register IRQ\n");
goto failed;
/* release the region we just claimed */
dprintkl(KERN_INFO, "Failed to register IRQ\n");
goto failed;
@@
-4949,7
+4948,7
@@
static struct pci_driver dc395x_driver = {
**/
static int __init dc395x_module_init(void)
{
**/
static int __init dc395x_module_init(void)
{
- return pci_
module_init
(&dc395x_driver);
+ return pci_
register_driver
(&dc395x_driver);
}
}