On Tue, May 04, 2021 at 03:32:53PM +0200, Fabio M. De Francesco wrote:
> +static int setup_scsitaskmgmt_handles(struct xarray *xa, struct uiscmdrsp *cmdrsp,
> wait_queue_head_t *event, int *result)
> {
> - /* specify the event that has to be triggered when this */
> - /* cmd is complete */
> - cmdrsp->scsitaskmgmt.notify_handle =
> - simple_idr_get(idrtable, event, lock);
> - cmdrsp->scsitaskmgmt.notifyresult_handle =
> - simple_idr_get(idrtable, result, lock);
> + int ret;
> + u32 id;
> +
> + /* specify the event that has to be triggered when this cmd is complete */
> + ret = xa_alloc_irq(xa, &id, event, xa_limit_32b, GFP_KERNEL);
> + if (ret)
> + return ret;
> + else
> + cmdrsp->scsitaskmgmt.notify_handle = id;
> + ret = xa_alloc_irq(xa, &id, result, xa_limit_32b, GFP_KERNEL);
> + if (ret) {
> + xa_erase_irq(xa, cmdrsp->scsitaskmgmt.notify_handle);
> + return ret;
> + } else
> + cmdrsp->scsitaskmgmt.notifyresult_handle = id;
This else statement is not required. Please use the checkpatch script.
if (ret) {
xa_erase_irq(xa, cmdrsp->scsitaskmgmt.notify_handle);
return ret;
}
cmdrsp->scsitaskmgmt.notifyresult_handle = id;
> +
> + return 0;
> }
>
[ snip ]
> @@ -1096,7 +1080,7 @@ static void visorhba_remove(struct visor_device *dev)
> scsi_remove_host(scsihost);
> scsi_host_put(scsihost);
>
> - idr_destroy(&devdata->idr);
> + xa_destroy(&devdata->xa);
Don't add this. Matthew explained this earlier.
>
> dev_set_drvdata(&dev->device, NULL);
> debugfs_remove(devdata->debugfs_info);
regards,
dan carpenter
