diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-17 20:37:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-17 20:37:16 +0100 |
| commit | e9c4cbc7aaa771a19209d949e9fb9c8758e3e2a4 (patch) | |
| tree | 53a9f0e76cf329916358f2e61f6663d90b38c464 /include | |
| parent | 5672daf8f8726cf37e0ba0a08793e282935e71f6 (diff) | |
| parent | c037ebe671f86f32aa73eaa78e20e7f24017e41d (diff) | |
| download | linux-next-e9c4cbc7aaa771a19209d949e9fb9c8758e3e2a4.tar.gz linux-next-e9c4cbc7aaa771a19209d949e9fb9c8758e3e2a4.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_host.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 16243ec376cd..daaf1247673f 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -534,9 +534,9 @@ struct scsi_host_template { unsigned long irq_flags; \ enum scsi_qc_status rc; \ \ - spin_lock_irqsave(shost->host_lock, irq_flags); \ + spin_lock_irqsave(&shost->host_lock, irq_flags); \ rc = func_name##_lck(cmd); \ - spin_unlock_irqrestore(shost->host_lock, irq_flags); \ + spin_unlock_irqrestore(&shost->host_lock, irq_flags); \ return rc; \ } @@ -570,8 +570,7 @@ struct Scsi_Host { struct list_head starved_list; - spinlock_t default_lock; - spinlock_t *host_lock; + spinlock_t host_lock; struct mutex scan_mutex;/* serialize scanning activity */ @@ -953,6 +952,6 @@ static inline unsigned char scsi_host_get_guard(struct Scsi_Host *shost) } int scsi_host_set_state(struct Scsi_Host *shost, enum scsi_host_state state) - __must_hold(shost->host_lock); + __must_hold(&shost->host_lock); #endif /* _SCSI_SCSI_HOST_H */ |