Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0f5207 authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Removed wrapper funtions _scsih_link_change. 



Deleted the wrapper function called _scsih_link_change. This function was
implemented for compatibility reasons only, between different kernel versions.
Currently this function is no longer needed.  The calling function are
converted to calling mpt2sas_transport_update_phy_link_change directly in the
transport layer.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Reviewed-by: default avatarEric Moore <Eric.moore@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 155dd4c7

drivers/scsi/mpt2sas/mpt2sas_base.h

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ int mpt2sas_transport_add_host_phy(struct MPT2SAS_ADAPTER *ioc, struct _sas_phy 
    *mpt2sas_phy, Mpi2SasPhyPage0_t phy_pg0, struct device *parent_dev);

int mpt2sas_transport_add_expander_phy(struct MPT2SAS_ADAPTER *ioc, struct _sas_phy

    *mpt2sas_phy, Mpi2ExpanderPage1_t expander_pg1, struct device *parent_dev);

void mpt2sas_transport_update_phy_link_change(struct MPT2SAS_ADAPTER *ioc, u16 handle,

void mpt2sas_transport_update_links(struct MPT2SAS_ADAPTER *ioc, u16 handle,

   u16 attached_handle, u8 phy_number, u8 link_rate);

extern struct sas_function_template mpt2sas_transport_functions;

extern struct scsi_transport_template *mpt2sas_transport_template;

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+14 −30
Original line number Diff line number Diff line
@@ -3123,25 +3123,6 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 VF_ID, u32 reply) 
	scmd->scsi_done(scmd);

}



/**

 * _scsih_link_change - process phy link changes

 * @ioc: per adapter object

 * @handle: phy handle

 * @attached_handle: valid for devices attached to link

 * @phy_number: phy number

 * @link_rate: new link rate

 * Context: user.

 *

 * Return nothing.

 */

static void

_scsih_link_change(struct MPT2SAS_ADAPTER *ioc, u16 handle, u16 attached_handle,

   u8 phy_number, u8 link_rate)

{

	mpt2sas_transport_update_phy_link_change(ioc, handle, attached_handle,

	    phy_number, link_rate);

}



/**

 * _scsih_sas_host_refresh - refreshing sas host object contents

 * @ioc: per adapter object
@@ -3186,7 +3167,8 @@ _scsih_sas_host_refresh(struct MPT2SAS_ADAPTER *ioc, u8 update) 
			    le16_to_cpu(sas_iounit_pg0->PhyData[i].

				ControllerDevHandle);

			if (update)

				_scsih_link_change(ioc,

				mpt2sas_transport_update_links(

				    ioc,

				    ioc->sas_hba.phy[i].handle,

				    le16_to_cpu(sas_iounit_pg0->PhyData[i].

				    AttachedDevHandle), i,
@@ -3868,7 +3850,8 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, 
		case MPI2_EVENT_SAS_TOPO_RC_TARG_ADDED:

			if (!parent_handle) {

				if (phy_number < ioc->sas_hba.num_phys)

					_scsih_link_change(ioc,

					mpt2sas_transport_update_links(

					ioc,

					ioc->sas_hba.phy[phy_number].handle,

					handle, phy_number, link_rate_);

			} else {
@@ -3880,7 +3863,8 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, 
				    flags);

				if (sas_expander) {

					if (phy_number < sas_expander->num_phys)

						_scsih_link_change(ioc,

						mpt2sas_transport_update_links(

						ioc,

						sas_expander->

						phy[phy_number].handle,

						handle, phy_number,
@@ -4400,7 +4384,7 @@ _scsih_sas_pd_add(struct MPT2SAS_ADAPTER *ioc, 
		return;

	}



	_scsih_link_change(ioc,

	mpt2sas_transport_update_links(ioc,

	    le16_to_cpu(sas_device_pg0.ParentDevHandle),

	    handle, sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);
@@ -4689,7 +4673,7 @@ _scsih_sas_ir_physical_disk_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, 
			return;

		}



		_scsih_link_change(ioc,

		mpt2sas_transport_update_links(ioc,

		    le16_to_cpu(sas_device_pg0.ParentDevHandle),

		    handle, sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);

drivers/scsi/mpt2sas/mpt2sas_transport.c

+2 −2
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ mpt2sas_transport_add_expander_phy(struct MPT2SAS_ADAPTER *ioc, struct _sas_phy 
}



/**

 * mpt2sas_transport_update_phy_link_change - refreshing phy link changes and attached devices

 * mpt2sas_transport_update_links - refreshing phy link changes

 * @ioc: per adapter object

 * @handle: handle to sas_host or expander

 * @attached_handle: attached device handle
@@ -802,7 +802,7 @@ mpt2sas_transport_add_expander_phy(struct MPT2SAS_ADAPTER *ioc, struct _sas_phy 
 * Returns nothing.

 */

void

mpt2sas_transport_update_phy_link_change(struct MPT2SAS_ADAPTER *ioc,

mpt2sas_transport_update_links(struct MPT2SAS_ADAPTER *ioc,

    u16 handle, u16 attached_handle, u8 phy_number, u8 link_rate)

{

	unsigned long flags;