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

Commit 8ee24023 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by James Bottomley
Browse files

[SCSI] libsas: Fix various sparse complaints 



Annotate sas_queuecommand with locking details, and clean up a few
more sparse warnings about static/non-static declarations.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 5929faf3

drivers/scsi/libsas/sas_scsi_host.c

+5 −1
Original line number Diff line number Diff line
@@ -200,6 +200,10 @@ int sas_queue_up(struct sas_task *task) 
 */

int sas_queuecommand(struct scsi_cmnd *cmd,

		     void (*scsi_done)(struct scsi_cmnd *))

	__releases(host->host_lock)

	__acquires(dev->sata_dev.ap->lock)

	__releases(dev->sata_dev.ap->lock)

	__acquires(host->host_lock)

{

	int res = 0;

	struct domain_device *dev = cmd_to_domain_dev(cmd);
@@ -410,7 +414,7 @@ static int sas_recover_I_T(struct domain_device *dev) 
}



/* Find the sas_phy that's attached to this device */

struct sas_phy *find_local_sas_phy(struct domain_device *dev)

static struct sas_phy *find_local_sas_phy(struct domain_device *dev)

{

	struct domain_device *pdev = dev->parent;

	struct ex_phy *exphy = NULL;

include/scsi/libsas.h

+1 −3
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ struct sas_task { 
	struct work_struct abort_work;

};





extern struct kmem_cache *sas_task_cache;



#define SAS_TASK_STATE_PENDING      1

#define SAS_TASK_STATE_DONE         2
@@ -573,7 +573,6 @@ struct sas_task { 


static inline struct sas_task *sas_alloc_task(gfp_t flags)

{

	extern struct kmem_cache *sas_task_cache;

	struct sas_task *task = kmem_cache_zalloc(sas_task_cache, flags);



	if (task) {
@@ -590,7 +589,6 @@ static inline struct sas_task *sas_alloc_task(gfp_t flags) 
static inline void sas_free_task(struct sas_task *task)

{

	if (task) {

		extern struct kmem_cache *sas_task_cache;

		BUG_ON(!list_empty(&task->list));

		kmem_cache_free(sas_task_cache, task);

	}