Merge tag 'dma-mapping-5.20-2022-08-06' of git://git.infradead.org/users/hch/dma...

[platform/kernel/linux-starfive.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index d04bd2c..26bf3b1 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -355,7 +355,7 @@ static void scsi_host_dev_release(struct device *dev)
 
        kfree(shost->shost_data);
 
-       ida_simple_remove(&host_index_ida, shost->host_no);
+       ida_free(&host_index_ida, shost->host_no);
 
        if (shost->shost_state != SHOST_CREATED)
                put_device(parent);
@@ -400,7 +400,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
        init_waitqueue_head(&shost->host_wait);
        mutex_init(&shost->scan_mutex);
 
-       index = ida_simple_get(&host_index_ida, 0, 0, GFP_KERNEL);
+       index = ida_alloc(&host_index_ida, GFP_KERNEL);
        if (index < 0) {
                kfree(shost);
                return NULL;
@@ -571,8 +571,7 @@ struct Scsi_Host *scsi_host_get(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL(scsi_host_get);
 
-static bool scsi_host_check_in_flight(struct request *rq, void *data,
-                                     bool reserved)
+static bool scsi_host_check_in_flight(struct request *rq, void *data)
 {
        int *count = data;
        struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq);
@@ -667,7 +666,7 @@ void scsi_flush_work(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL_GPL(scsi_flush_work);
 
-static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
+static bool complete_all_cmds_iter(struct request *rq, void *data)
 {
        struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
        enum scsi_host_status status = *(enum scsi_host_status *)data;
@@ -698,17 +697,16 @@ void scsi_host_complete_all_commands(struct Scsi_Host *shost,
 EXPORT_SYMBOL_GPL(scsi_host_complete_all_commands);
 
 struct scsi_host_busy_iter_data {
-       bool (*fn)(struct scsi_cmnd *, void *, bool);
+       bool (*fn)(struct scsi_cmnd *, void *);
        void *priv;
 };
 
-static bool __scsi_host_busy_iter_fn(struct request *req, void *priv,
-                                  bool reserved)
+static bool __scsi_host_busy_iter_fn(struct request *req, void *priv)
 {
        struct scsi_host_busy_iter_data *iter_data = priv;
        struct scsi_cmnd *sc = blk_mq_rq_to_pdu(req);
 
-       return iter_data->fn(sc, iter_data->priv, reserved);
+       return iter_data->fn(sc, iter_data->priv);
 }
 
 /**
@@ -721,7 +719,7 @@ static bool __scsi_host_busy_iter_fn(struct request *req, void *priv,
  * ithas to be provided by the caller
  **/
 void scsi_host_busy_iter(struct Scsi_Host *shost,
-                        bool (*fn)(struct scsi_cmnd *, void *, bool),
+                        bool (*fn)(struct scsi_cmnd *, void *),
                         void *priv)
 {
        struct scsi_host_busy_iter_data iter_data = {