diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-07-18 14:24:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-07-18 14:24:56 +0200 |
| commit | 21634f0f307c8401462da2cd07507880ee17d3fc (patch) | |
| tree | 8dd1b41a5a1bd9fe9a340814c4101f33df827f40 /drivers/scsi/scsi_debug.c | |
| parent | 6d68d9cba1d0d1ee628a783eb9e7d38a0c3691b8 (diff) | |
| parent | 2218e10e6fec05f76d6cd2c7eed4cb5af447360b (diff) | |
Merge branch 'topic/hda-pci-ids' into for-next
Pull cleanup of HD-audio PCI IDs.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/scsi/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 8c58128ad32a..9c0af50501f9 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -841,11 +841,6 @@ static int sdeb_zbc_nr_conv = DEF_ZBC_NR_CONV_ZONES; static int submit_queues = DEF_SUBMIT_QUEUES; /* > 1 for multi-queue (mq) */ static int poll_queues; /* iouring iopoll interface.*/ -static DEFINE_RWLOCK(atomic_rw); -static DEFINE_RWLOCK(atomic_rw2); - -static rwlock_t *ramdisk_lck_a[2]; - static char sdebug_proc_name[] = MY_NAME; static const char *my_name = MY_NAME; @@ -6818,9 +6813,6 @@ static int __init scsi_debug_init(void) int k, ret, hosts_to_add; int idx = -1; - ramdisk_lck_a[0] = &atomic_rw; - ramdisk_lck_a[1] = &atomic_rw2; - if (sdebug_ndelay >= 1000 * 1000 * 1000) { pr_warn("ndelay must be less than 1 second, ignored\n"); sdebug_ndelay = 0; |