Commit 042ebd29 authored by Jason Yan's avatar Jason Yan Committed by Martin K. Petersen
Browse files

scsi: libsas: kill useless ha_event and do some cleanup 



The ha_event now has only one event HAE_RESET, and this event does
nothing. Kill it and do some cleanup.

This is a preparation for enhance libsas hotplug feature in the next
patches.

Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
CC: Johannes Thumshirn <jthumshirn@suse.de>
CC: Ewan Milne <emilne@redhat.com>
CC: Christoph Hellwig <hch@lst.de>
CC: Tomas Henzl <thenzl@redhat.com>
CC: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7eccdf00

drivers/scsi/aic94xx/aic94xx_hwi.c

+0 −3
Original line number Diff line number Diff line
@@ -721,11 +721,8 @@ Out: 
 */

static void asd_chip_reset(struct asd_ha_struct *asd_ha)

{

	struct sas_ha_struct *sas_ha = &asd_ha->sas_ha;



	ASD_DPRINTK("chip reset for %s\n", pci_name(asd_ha->pcidev));

	asd_chip_hardrst(asd_ha);

	sas_ha->notify_ha_event(sas_ha, HAE_RESET);

}



/* ---------- Done List Routines ---------- */

drivers/scsi/hisi_sas/hisi_sas_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,6 @@ static int hisi_sas_controller_reset(struct hisi_hba *hisi_hba) 
	hisi_sas_release_tasks(hisi_hba);

	spin_unlock_irqrestore(&hisi_hba->lock, flags);



	sas_ha->notify_ha_event(sas_ha, HAE_RESET);

	clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);



	/* Init and wait for PHYs to come up and all libsas event finished. */

drivers/scsi/libsas/sas_dump.c

+0 −10
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 


#include "sas_dump.h"



static const char *sas_hae_str[] = {

	[0] = "HAE_RESET",

};



static const char *sas_porte_str[] = {

	[0] = "PORTE_BYTES_DMAED",

	[1] = "PORTE_BROADCAST_RCVD",
@@ -53,12 +49,6 @@ void sas_dprint_phye(int phyid, enum phy_event pe) 
	SAS_DPRINTK("phy%d: phy event: %s\n", phyid, sas_phye_str[pe]);

}



void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he)

{

	SAS_DPRINTK("ha %s: %s event\n", dev_name(sas_ha->dev),

		    sas_hae_str[he]);

}



void sas_dump_port(struct asd_sas_port *port)

{

	SAS_DPRINTK("port%d: class:0x%x\n", port->id, port->class);

drivers/scsi/libsas/sas_dump.h

+0 −1
Original line number Diff line number Diff line
@@ -26,5 +26,4 @@ 


void sas_dprint_porte(int phyid, enum port_event pe);

void sas_dprint_phye(int phyid, enum phy_event pe);

void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he);

void sas_dump_port(struct asd_sas_port *port);

drivers/scsi/libsas/sas_event.c

+0 −20
Original line number Diff line number Diff line
@@ -124,14 +124,6 @@ void sas_enable_revalidation(struct sas_ha_struct *ha) 
	mutex_unlock(&ha->disco_mutex);

}



static int notify_ha_event(struct sas_ha_struct *sas_ha, enum ha_event event)

{

	BUG_ON(event >= HA_NUM_EVENTS);



	return sas_queue_event(event, &sas_ha->pending,

			       &sas_ha->ha_events[event].work, sas_ha);

}



static int notify_port_event(struct asd_sas_phy *phy, enum port_event event)

{

	struct sas_ha_struct *ha = phy->ha;
@@ -154,18 +146,6 @@ int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event) 


int sas_init_events(struct sas_ha_struct *sas_ha)

{

	static const work_func_t sas_ha_event_fns[HA_NUM_EVENTS] = {

		[HAE_RESET] = sas_hae_reset,

	};



	int i;



	for (i = 0; i < HA_NUM_EVENTS; i++) {

		INIT_SAS_WORK(&sas_ha->ha_events[i].work, sas_ha_event_fns[i]);

		sas_ha->ha_events[i].ha = sas_ha;

	}



	sas_ha->notify_ha_event = notify_ha_event;

	sas_ha->notify_port_event = notify_port_event;

	sas_ha->notify_phy_event = sas_notify_phy_event;

CRA Git | Maintained and supported by SUSTech CRA and CCSE