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

Commit 5d003240 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

skd: Move skd_free_sg_list() up 



Issue a warning if a NULL argument is passed to skd_free_sg_list().
Move this function up to make the blk-mq conversion patch easier
to read.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4e54b849

drivers/block/skd_main.c

+12 −13
Original line number Diff line number Diff line
@@ -2850,6 +2850,18 @@ static struct fit_sg_descriptor *skd_cons_sg_list(struct skd_device *skdev, 
	return sg_list;

}



static void skd_free_sg_list(struct skd_device *skdev,

			     struct fit_sg_descriptor *sg_list, u32 n_sg,

			     dma_addr_t dma_addr)

{

	u32 nbytes = sizeof(*sg_list) * n_sg;



	if (WARN_ON_ONCE(!sg_list))

		return;



	pci_free_consistent(skdev->pdev, nbytes, sg_list, dma_addr);

}



static int skd_cons_skreq(struct skd_device *skdev)

{

	int rc = 0;
@@ -3105,19 +3117,6 @@ static void skd_free_skmsg(struct skd_device *skdev) 
	skdev->skmsg_table = NULL;

}



static void skd_free_sg_list(struct skd_device *skdev,

			     struct fit_sg_descriptor *sg_list,

			     u32 n_sg, dma_addr_t dma_addr)

{

	if (sg_list != NULL) {

		u32 nbytes;



		nbytes = sizeof(*sg_list) * n_sg;



		pci_free_consistent(skdev->pdev, nbytes, sg_list, dma_addr);

	}

}



static void skd_free_skreq(struct skd_device *skdev)

{

	u32 i;