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

Commit 4bc05809 authored by Luo Jiaxing's avatar Luo Jiaxing Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Remove some unused function arguments 

Some function arguments are unused, so remove them.

Also move the timeout print in for wait_cmds_complete_timeout_vX_hw()
callsites into that same function.

Link: https://lore.kernel.org/r/1567774537-20003-11-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarLuo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 27f22723

drivers/scsi/hisi_sas/hisi_sas.h

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ struct hisi_sas_hw { 
	u32 (*get_phys_state)(struct hisi_hba *hisi_hba);

	int (*write_gpio)(struct hisi_hba *hisi_hba, u8 reg_type,

				u8 reg_index, u8 reg_count, u8 *write_data);

	int (*wait_cmds_complete_timeout)(struct hisi_hba *hisi_hba,

	void (*wait_cmds_complete_timeout)(struct hisi_hba *hisi_hba,

					   int delay_ms, int timeout_ms);

	void (*snapshot_prepare)(struct hisi_hba *hisi_hba);

	void (*snapshot_restore)(struct hisi_hba *hisi_hba);

drivers/scsi/hisi_sas/hisi_sas_main.c

+2 −3
Original line number Diff line number Diff line
@@ -1391,8 +1391,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) 
	}

}



static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 old_state,

			      u32 state)

static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state)

{

	struct sas_ha_struct *sas_ha = &hisi_hba->sha;

	struct asd_sas_port *_sas_port = NULL;
@@ -1553,7 +1552,7 @@ void hisi_sas_controller_reset_done(struct hisi_hba *hisi_hba) 
	clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);



	state = hisi_hba->hw->get_phys_state(hisi_hba);

	hisi_sas_rescan_topology(hisi_hba, hisi_hba->phy_state, state);

	hisi_sas_rescan_topology(hisi_hba, state);

}

EXPORT_SYMBOL_GPL(hisi_sas_controller_reset_done);

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+6 −5
Original line number Diff line number Diff line
@@ -3498,7 +3498,7 @@ static int write_gpio_v2_hw(struct hisi_hba *hisi_hba, u8 reg_type, 
	return 0;

}



static int wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba,

static void wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba,

					     int delay_ms, int timeout_ms)

{

	struct device *dev = hisi_hba->dev;
@@ -3513,12 +3513,13 @@ static int wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba, 
		msleep(delay_ms);

	}



	if (time >= timeout_ms)

		return -ETIMEDOUT;

	if (time >= timeout_ms) {

		dev_dbg(dev, "Wait commands complete timeout!\n");

		return;

	}



	dev_dbg(dev, "wait commands complete %dms\n", time);



	return 0;

}



static struct device_attribute *host_attrs_v2_hw[] = {

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+7 −10
Original line number Diff line number Diff line
@@ -2576,7 +2576,7 @@ static int write_gpio_v3_hw(struct hisi_hba *hisi_hba, u8 reg_type, 
	return 0;

}



static int wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba,

static void wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba,

					     int delay_ms, int timeout_ms)

{

	struct device *dev = hisi_hba->dev;
@@ -2591,12 +2591,12 @@ static int wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba, 
		msleep(delay_ms);

	}



	if (time >= timeout_ms)

		return -ETIMEDOUT;

	if (time >= timeout_ms) {

		dev_dbg(dev, "Wait commands complete timeout!\n");

		return;

	}



	dev_dbg(dev, "wait commands complete %dms\n", time);



	return 0;

}



static ssize_t intr_conv_v3_hw_show(struct device *dev,
@@ -2877,14 +2877,11 @@ static const struct hisi_sas_debugfs_reg debugfs_ras_reg = { 


static void debugfs_snapshot_prepare_v3_hw(struct hisi_hba *hisi_hba)

{

	struct device *dev = hisi_hba->dev;



	set_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);



	hisi_sas_write32(hisi_hba, DLVRY_QUEUE_ENABLE, 0);



	if (wait_cmds_complete_timeout_v3_hw(hisi_hba, 100, 5000) == -ETIMEDOUT)

		dev_dbg(dev, "Wait commands complete timeout!\n");

	wait_cmds_complete_timeout_v3_hw(hisi_hba, 100, 5000);



	hisi_sas_kill_tasklets(hisi_hba);

}