Commit 249cf320 authored by Binoy Jayan's avatar Binoy Jayan Committed by Martin K. Petersen

scsi: esas2r: Replace semaphore fs_api_semaphore with mutex

The semaphore 'fs_api_semaphore' is used as a simple mutex, so it should
be written as one. Semaphores are going away in the future.
Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 74d2fd48
...@@ -946,7 +946,7 @@ struct esas2r_adapter { ...@@ -946,7 +946,7 @@ struct esas2r_adapter {
struct esas2r_mem_desc *vrq_mds; struct esas2r_mem_desc *vrq_mds;
int num_vrqs; int num_vrqs;
struct mutex fm_api_mutex; struct mutex fm_api_mutex;
struct semaphore fs_api_semaphore; struct mutex fs_api_mutex;
struct semaphore nvram_semaphore; struct semaphore nvram_semaphore;
struct atto_ioctl *local_atto_ioctl; struct atto_ioctl *local_atto_ioctl;
u8 fw_coredump_buff[ESAS2R_FWCOREDUMP_SZ]; u8 fw_coredump_buff[ESAS2R_FWCOREDUMP_SZ];
......
...@@ -328,7 +328,7 @@ int esas2r_init_adapter(struct Scsi_Host *host, struct pci_dev *pcid, ...@@ -328,7 +328,7 @@ int esas2r_init_adapter(struct Scsi_Host *host, struct pci_dev *pcid,
spin_lock_init(&a->request_lock); spin_lock_init(&a->request_lock);
spin_lock_init(&a->fw_event_lock); spin_lock_init(&a->fw_event_lock);
mutex_init(&a->fm_api_mutex); mutex_init(&a->fm_api_mutex);
sema_init(&a->fs_api_semaphore, 1); mutex_init(&a->fs_api_mutex);
sema_init(&a->nvram_semaphore, 1); sema_init(&a->nvram_semaphore, 1);
esas2r_fw_event_off(a); esas2r_fw_event_off(a);
......
...@@ -1962,7 +1962,7 @@ int esas2r_read_fs(struct esas2r_adapter *a, char *buf, long off, int count) ...@@ -1962,7 +1962,7 @@ int esas2r_read_fs(struct esas2r_adapter *a, char *buf, long off, int count)
(struct esas2r_ioctl_fs *)a->fs_api_buffer; (struct esas2r_ioctl_fs *)a->fs_api_buffer;
/* If another flash request is already in progress, return. */ /* If another flash request is already in progress, return. */
if (down_interruptible(&a->fs_api_semaphore)) { if (mutex_lock_interruptible(&a->fs_api_mutex)) {
busy: busy:
fs->status = ATTO_STS_OUT_OF_RSRC; fs->status = ATTO_STS_OUT_OF_RSRC;
return -EBUSY; return -EBUSY;
...@@ -1978,7 +1978,7 @@ int esas2r_read_fs(struct esas2r_adapter *a, char *buf, long off, int count) ...@@ -1978,7 +1978,7 @@ int esas2r_read_fs(struct esas2r_adapter *a, char *buf, long off, int count)
rq = esas2r_alloc_request(a); rq = esas2r_alloc_request(a);
if (rq == NULL) { if (rq == NULL) {
esas2r_debug("esas2r_read_fs: out of requests"); esas2r_debug("esas2r_read_fs: out of requests");
up(&a->fs_api_semaphore); mutex_unlock(&a->fs_api_mutex);
goto busy; goto busy;
} }
...@@ -2006,7 +2006,7 @@ int esas2r_read_fs(struct esas2r_adapter *a, char *buf, long off, int count) ...@@ -2006,7 +2006,7 @@ int esas2r_read_fs(struct esas2r_adapter *a, char *buf, long off, int count)
; ;
dont_wait: dont_wait:
/* Free the request and keep going */ /* Free the request and keep going */
up(&a->fs_api_semaphore); mutex_unlock(&a->fs_api_mutex);
esas2r_free_request(a, (struct esas2r_request *)rq); esas2r_free_request(a, (struct esas2r_request *)rq);
/* Pick up possible error code from above */ /* Pick up possible error code from above */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment