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: Binoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index c5013de964e6cdcca51bae1a4de09caac2c8b39c..1da6407ee14214f9a88ca23d918ce5af05f39ce4 100644 (file)
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -946,7 +946,7 @@ struct esas2r_adapter {
        struct esas2r_mem_desc *vrq_mds;
        int num_vrqs;
        struct mutex fm_api_mutex;
-       struct semaphore fs_api_semaphore;
+       struct mutex fs_api_mutex;
        struct semaphore nvram_semaphore;
        struct atto_ioctl *local_atto_ioctl;
        u8 fw_coredump_buff[ESAS2R_FWCOREDUMP_SZ];

diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
index ad85b33ab6b45cf48e702caa0ff22b01cf8551c5..5b14dd29b764cc2d48b8364853f7d058d4cca319 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_init.c
+++ b/drivers/scsi/esas2r/esas2r_init.c
@@ -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->fw_event_lock);
        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);
 
        esas2r_fw_event_off(a);

diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c
index c6b041a9f007a55c2a34149402a963a6715e1f7e..97623002908f125b96e1bc02282a678712286768 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_ioctl.c
+++ b/drivers/scsi/esas2r/esas2r_ioctl.c
@@ -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;
 
                /* 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:
                        fs->status = ATTO_STS_OUT_OF_RSRC;
                        return -EBUSY;
@@ -1978,7 +1978,7 @@ busy:
                rq = esas2r_alloc_request(a);
                if (rq == NULL) {
                        esas2r_debug("esas2r_read_fs: out of requests");
-                       up(&a->fs_api_semaphore);
+                       mutex_unlock(&a->fs_api_mutex);
                        goto busy;
                }
 
@@ -2006,7 +2006,7 @@ busy:
                ;
 dont_wait:
                /* 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);
 
                /* Pick up possible error code from above */