Commit ce4fc333 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Co-locate exports with symbols 

It is standard practice to co-locate export declarations with the symbol
which is being exported. Or at least in the same file - see
sas_phy_reset().

Modify libsas to follow this practice consistently.

Link: https://lore.kernel.org/r/1631530296-32358-1-git-send-email-john.garry@huawei.com


Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9aec5ffa

drivers/scsi/libsas/sas_init.c

+3 −2
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ int sas_register_ha(struct sas_ha_struct *sas_ha) 


	return error;

}

EXPORT_SYMBOL_GPL(sas_register_ha);



static void sas_disable_events(struct sas_ha_struct *sas_ha)

{
@@ -176,6 +177,7 @@ int sas_unregister_ha(struct sas_ha_struct *sas_ha) 


	return 0;

}

EXPORT_SYMBOL_GPL(sas_unregister_ha);



static int sas_get_linkerrors(struct sas_phy *phy)

{
@@ -313,6 +315,7 @@ int sas_phy_reset(struct sas_phy *phy, int hard_reset) 
	}

	return ret;

}

EXPORT_SYMBOL_GPL(sas_phy_reset);



int sas_set_phy_speed(struct sas_phy *phy,

		      struct sas_phy_linkrates *rates)
@@ -659,5 +662,3 @@ MODULE_LICENSE("GPL v2"); 
module_init(sas_class_init);

module_exit(sas_class_exit);

EXPORT_SYMBOL_GPL(sas_register_ha);

EXPORT_SYMBOL_GPL(sas_unregister_ha);

drivers/scsi/libsas/sas_scsi_host.c

+11 −12
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ int sas_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
	cmd->scsi_done(cmd);

	return 0;

}

EXPORT_SYMBOL_GPL(sas_queuecommand);



static void sas_eh_finish_cmd(struct scsi_cmnd *cmd)

{
@@ -511,6 +512,7 @@ int sas_eh_device_reset_handler(struct scsi_cmnd *cmd) 


	return FAILED;

}

EXPORT_SYMBOL_GPL(sas_eh_device_reset_handler);



int sas_eh_target_reset_handler(struct scsi_cmnd *cmd)

{
@@ -532,6 +534,7 @@ int sas_eh_target_reset_handler(struct scsi_cmnd *cmd) 


	return FAILED;

}

EXPORT_SYMBOL_GPL(sas_eh_target_reset_handler);



/* Try to reset a device */

static int try_to_reset_cmd_device(struct scsi_cmnd *cmd)
@@ -790,6 +793,7 @@ int sas_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) 


	return -EINVAL;

}

EXPORT_SYMBOL_GPL(sas_ioctl);



struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy)

{
@@ -832,6 +836,7 @@ int sas_target_alloc(struct scsi_target *starget) 
	starget->hostdata = found_dev;

	return 0;

}

EXPORT_SYMBOL_GPL(sas_target_alloc);



#define SAS_DEF_QD 256
@@ -860,6 +865,7 @@ int sas_slave_configure(struct scsi_device *scsi_dev) 


	return 0;

}

EXPORT_SYMBOL_GPL(sas_slave_configure);



int sas_change_queue_depth(struct scsi_device *sdev, int depth)

{
@@ -872,6 +878,7 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth) 
		depth = 1;

	return scsi_change_queue_depth(sdev, depth);

}

EXPORT_SYMBOL_GPL(sas_change_queue_depth);



int sas_bios_param(struct scsi_device *scsi_dev,

			  struct block_device *bdev,
@@ -884,6 +891,7 @@ int sas_bios_param(struct scsi_device *scsi_dev, 


	return 0;

}

EXPORT_SYMBOL_GPL(sas_bios_param);



/*

 * Tell an upper layer that it needs to initiate an abort for a given task.
@@ -910,6 +918,7 @@ void sas_task_abort(struct sas_task *task) 
	else

		blk_abort_request(scsi_cmd_to_rq(sc));

}

EXPORT_SYMBOL_GPL(sas_task_abort);



int sas_slave_alloc(struct scsi_device *sdev)

{
@@ -918,6 +927,7 @@ int sas_slave_alloc(struct scsi_device *sdev) 


	return 0;

}

EXPORT_SYMBOL_GPL(sas_slave_alloc);



void sas_target_destroy(struct scsi_target *starget)

{
@@ -929,6 +939,7 @@ void sas_target_destroy(struct scsi_target *starget) 
	starget->hostdata = NULL;

	sas_put_device(found_dev);

}

EXPORT_SYMBOL_GPL(sas_target_destroy);



#define SAS_STRING_ADDR_SIZE	16
@@ -956,15 +967,3 @@ int sas_request_addr(struct Scsi_Host *shost, u8 *addr) 
}

EXPORT_SYMBOL_GPL(sas_request_addr);

EXPORT_SYMBOL_GPL(sas_queuecommand);

EXPORT_SYMBOL_GPL(sas_target_alloc);

EXPORT_SYMBOL_GPL(sas_slave_configure);

EXPORT_SYMBOL_GPL(sas_change_queue_depth);

EXPORT_SYMBOL_GPL(sas_bios_param);

EXPORT_SYMBOL_GPL(sas_task_abort);

EXPORT_SYMBOL_GPL(sas_phy_reset);

EXPORT_SYMBOL_GPL(sas_eh_device_reset_handler);

EXPORT_SYMBOL_GPL(sas_eh_target_reset_handler);

EXPORT_SYMBOL_GPL(sas_slave_alloc);

EXPORT_SYMBOL_GPL(sas_target_destroy);

EXPORT_SYMBOL_GPL(sas_ioctl);