Skip to content

Commit d3558ca

Browse files
tyreldmartinkpetersen
authored andcommitted
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>
1 parent 5144905 commit d3558ca

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/scsi/ibmvscsi/ibmvfc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5013,7 +5013,7 @@ static void ibmvfc_channel_setup_done(struct ibmvfc_event *evt)
50135013
{
50145014
struct ibmvfc_host *vhost = evt->vhost;
50155015
struct ibmvfc_channel_setup *setup = vhost->channel_setup_buf;
5016-
struct ibmvfc_scsi_channels *scrqs = &vhost->scsi_scrqs;
5016+
struct ibmvfc_channels *scrqs = &vhost->scsi_scrqs;
50175017
u32 mad_status = be16_to_cpu(evt->xfer_iu->channel_setup.common.status);
50185018
int level = IBMVFC_DEFAULT_LOG_LEVEL;
50195019
int flags, active_queues, i;
@@ -5064,7 +5064,7 @@ static void ibmvfc_channel_setup(struct ibmvfc_host *vhost)
50645064
struct ibmvfc_channel_setup_mad *mad;
50655065
struct ibmvfc_channel_setup *setup_buf = vhost->channel_setup_buf;
50665066
struct ibmvfc_event *evt = ibmvfc_get_reserved_event(&vhost->crq);
5067-
struct ibmvfc_scsi_channels *scrqs = &vhost->scsi_scrqs;
5067+
struct ibmvfc_channels *scrqs = &vhost->scsi_scrqs;
50685068
unsigned int num_channels =
50695069
min(vhost->client_scsi_channels, vhost->max_vios_scsi_channels);
50705070
int level = IBMVFC_DEFAULT_LOG_LEVEL;

drivers/scsi/ibmvscsi/ibmvfc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ struct ibmvfc_queue {
815815
char name[32];
816816
};
817817

818-
struct ibmvfc_scsi_channels {
818+
struct ibmvfc_channels {
819819
struct ibmvfc_queue *scrqs;
820820
unsigned int active_queues;
821821
};
@@ -866,7 +866,7 @@ struct ibmvfc_host {
866866
mempool_t *tgt_pool;
867867
struct ibmvfc_queue crq;
868868
struct ibmvfc_queue async_crq;
869-
struct ibmvfc_scsi_channels scsi_scrqs;
869+
struct ibmvfc_channels scsi_scrqs;
870870
struct ibmvfc_npiv_login login_info;
871871
union ibmvfc_npiv_login_data *login_buf;
872872
dma_addr_t login_buf_dma;

0 commit comments

Comments
 (0)