diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-07-20 15:16:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-07-20 15:16:11 +0200 |
| commit | 5f69c65e07b99ceb113d304fe31e0c653eb1c4bc (patch) | |
| tree | 8b003c6d54a1a7590a09603ff94e6a8e85bf6cba /drivers/scsi/scsi_debug.c | |
| parent | de90f5165b1cda3f1b5975165e2da8a69dfae1d6 (diff) | |
| parent | 269f399dc19f0e5c51711c3ba3bd06e0ef6ef403 (diff) | |
Merge tag 'asoc-fix-v6.5-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.5
A few more fixes for v6.5, just small driver specific ones.
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; |