staging: unisys: remove unused variable
PATCH 1/2 staging: unisys: remove unused variable
The variables op, sd and zmotion were never being used.
Signed-off-by Sudip Mukherjee <[email protected]>
--- drivers/staging/unisys/visorhba/visorhba_main.c | 4 ---- drivers/staging/unisys/visorinput/visorinput.c | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/unisys/visorhba/visorhba_main.c +0 -4
@@ -453,7 +453,6 @@ visorhba_queue_command_lck(struct scsi_cmnd *scsicmd,struct uiscmdrsp *cmdrsp;struct scsi_device *scsidev = scsicmd->device;int insert_location; -unsigned char op;unsigned char *cdb = scsicmd->cmnd;struct Scsi_Host *scsihost = scsidev->host;unsigned int i;
@@ -511,7 +510,6 @@ visorhba_queue_command_lck(struct scsi_cmnd *scsicmd, } cmdrsp->scsi.guest_phys_entries =scsi_sg_count (scsicmd); - op = cdb[0 ];if (!visorchannel_signalinsert (devdata->dev->visorchannel,IOCHAN_TO_IOPART , cmdrsp)) {
@@ -759,11 +757,9 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)struct visorhba_devdata *devdata;struct visordisk_info *vdisk;struct scsi_device *scsidev; -struct sense_data *sd; scsidev = scsicmd->device;memcpy (scsicmd->sense_buffer, cmdrsp->scsi.sensebuf,MAX_SENSE_SIZE ); - sd = (struct sense_data *)scsicmd->sense_buffer;/* Do not log errors for disk-not-present inquiries */ if ((cmdrsp->scsi.cmnd[0] == INQUIRY) &&
drivers/staging/unisys/visorinput/visorinput.c +1 -3
@@ -523,7 +523,7 @@ visorinput_channel_interrupt(struct visor_device *dev)struct ultra_inputreport r;int scancode, keycode;struct input_dev *visorinput_dev; -int xmotion, ymotion, zmotion, button; +int xmotion, ymotion, button;int i;struct visorinput_devdata *devdata =dev_get_drvdata (&dev->device);
@@ -604,12 +604,10 @@ visorinput_channel_interrupt(struct visor_device *dev) }break ;case inputaction_wheel_rotate_away: - zmotion = r.activity.arg1;input_report_rel (visorinput_dev,REL_WHEEL ,1 );input_sync (visorinput_dev);break ;case inputaction_wheel_rotate_toward: - zmotion = r.activity.arg1;input_report_rel (visorinput_dev,REL_WHEEL ,-1 );input_sync (visorinput_dev);break ;
Signature · 1 line
1.9.1
PATCH 2/2 staging: unisys: return error value directly
In case of error we are jumping to err_del_scsipending_ent and always returning SCSI_MLQUEUE_DEVICE_BUSY from error path. We donot need a variable to return a fixed error value, it can be returned directly.
Signed-off-by Sudip Mukherjee <[email protected]>
--- drivers/staging/unisys/visorhba/visorhba_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/unisys/visorhba/visorhba_main.c +4 -8
@@ -460,7 +460,6 @@ visorhba_queue_command_lck(struct scsi_cmnd *scsicmd, (struct visorhba_devdata *)scsihost->hostdata;struct scatterlist *sg =NULL ;struct scatterlist *sglist =NULL ; -int err =0 ;if (devdata->serverdown || devdata->serverchangingstate)return SCSI_MLQUEUE_DEVICE_BUSY ;
@@ -495,10 +494,8 @@ visorhba_queue_command_lck(struct scsi_cmnd *scsicmd,if (cmdrsp->scsi.bufflen > devdata->max_buff_len) devdata->max_buff_len = cmdrsp->scsi.bufflen; -if (scsi_sg_count (scsicmd) >MAX_PHYS_INFO ) { - err =SCSI_MLQUEUE_DEVICE_BUSY ; +if (scsi_sg_count (scsicmd) >MAX_PHYS_INFO ) goto err_del_scsipending_ent; - }/* convert buffer to phys information */ /* buffer is scatterlist - copy it out */
@@ -512,16 +509,15 @@ visorhba_queue_command_lck(struct scsi_cmnd *scsicmd,if (!visorchannel_signalinsert (devdata->dev->visorchannel,IOCHAN_TO_IOPART , - cmdrsp)) { + cmdrsp))/* queue must be full and we aren't going to wait */ - err =SCSI_MLQUEUE_DEVICE_BUSY ; goto err_del_scsipending_ent; - } +return 0 ; err_del_scsipending_ent:del_scsipending_ent (devdata, insert_location); -return err; +return SCSI_MLQUEUE_DEVICE_BUSY ; }/**
Signature · 1 line
1.9.1