scsi: ibmvfc: Rename ibmvfc_scsi_channels to ibmvfc_channels

There is nothing scsi specific about the ibmvfc_scsi_channels struct. It is
meant to encapsulate a set of channels regardless of protocol.

Remove _scsi from the struct name to reflect this genric nature.

Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Link: https://lore.kernel.org/r/20230921225435.3537728-7-tyreld@linux.ibm.com
Reviewed-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 30baa046ae5b6cbcb76c97ee954f0917f19bf519..9a5b3ccb08090398a77bfabf1de7a572c09395fd 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -5013,7 +5013,7 @@ static void ibmvfc_channel_setup_done(struct ibmvfc_event *evt)
 {
        struct ibmvfc_host *vhost = evt->vhost;
        struct ibmvfc_channel_setup *setup = vhost->channel_setup_buf;
-       struct ibmvfc_scsi_channels *scrqs = &vhost->scsi_scrqs;
+       struct ibmvfc_channels *scrqs = &vhost->scsi_scrqs;
        u32 mad_status = be16_to_cpu(evt->xfer_iu->channel_setup.common.status);
        int level = IBMVFC_DEFAULT_LOG_LEVEL;
        int flags, active_queues, i;
@@ -5064,7 +5064,7 @@ static void ibmvfc_channel_setup(struct ibmvfc_host *vhost)
        struct ibmvfc_channel_setup_mad *mad;
        struct ibmvfc_channel_setup *setup_buf = vhost->channel_setup_buf;
        struct ibmvfc_event *evt = ibmvfc_get_reserved_event(&vhost->crq);
-       struct ibmvfc_scsi_channels *scrqs = &vhost->scsi_scrqs;
+       struct ibmvfc_channels *scrqs = &vhost->scsi_scrqs;
        unsigned int num_channels =
                min(vhost->client_scsi_channels, vhost->max_vios_scsi_channels);
        int level = IBMVFC_DEFAULT_LOG_LEVEL;

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 8ae52c239009acc38e9bee1c98943173f757e398..d88a528b8cc14c3ad7bab0bbe56be4ae34f8a3ee 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -815,7 +815,7 @@ struct ibmvfc_queue {
        char name[32];
 };
 
-struct ibmvfc_scsi_channels {
+struct ibmvfc_channels {
        struct ibmvfc_queue *scrqs;
        unsigned int active_queues;
 };
@@ -866,7 +866,7 @@ struct ibmvfc_host {
        mempool_t *tgt_pool;
        struct ibmvfc_queue crq;
        struct ibmvfc_queue async_crq;
-       struct ibmvfc_scsi_channels scsi_scrqs;
+       struct ibmvfc_channels scsi_scrqs;
        struct ibmvfc_npiv_login login_info;
        union ibmvfc_npiv_login_data *login_buf;
        dma_addr_t login_buf_dma;