diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-10-31 20:12:07 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-11-06 12:51:48 -0600 |
| commit | cb0258a2fb8e434b3b56856603754d998008d9ee (patch) | |
| tree | ed73e31359a1551e800dbdac59bc6caac72f894b /drivers/scsi/megaraid.h | |
| parent | f2c8dc402b939ddcb0299bb60227c47dc454c85a (diff) | |
| download | linux-cb0258a2fb8e434b3b56856603754d998008d9ee.tar.bz2 | |
[SCSI] megaraid (legacy): remove scsi_assign_lock usage
just take the adapter lock in megaraid_queue. Additional benefit is
that we can get rid of the awkward conditional locking in
mega_internal_command.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/megaraid.h')
| -rw-r--r-- | drivers/scsi/megaraid.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 4facf557cd19..6f9078025748 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h @@ -926,13 +926,6 @@ struct mega_hbas { #define MEGA_SGLIST 0x0002 /* - * lockscope definitions, callers can specify the lock scope with this data - * type. LOCK_INT would mean the caller has not acquired the lock before - * making the call and LOCK_EXT would mean otherwise. - */ -typedef enum { LOCK_INT, LOCK_EXT } lockscope_t; - -/* * Parameters for the io-mapped controllers */ @@ -1062,8 +1055,7 @@ static int mega_support_random_del(adapter_t *); static int mega_del_logdrv(adapter_t *, int); static int mega_do_del_logdrv(adapter_t *, int); static void mega_get_max_sgl(adapter_t *); -static int mega_internal_command(adapter_t *, lockscope_t, megacmd_t *, - mega_passthru *); +static int mega_internal_command(adapter_t *, megacmd_t *, mega_passthru *); static void mega_internal_done(Scsi_Cmnd *); static int mega_support_cluster(adapter_t *); #endif |