On 09/16/2015 04:26 PM, Matthew R. Ochs wrote: > @@ -296,7 +296,7 @@ static int read_cap16(struct scsi_device *sdev, struct > llun_info *lli) > int rc = 0; > int result = 0; > int retry_cnt = 0; > - u32 tout = (MC_DISCOVERY_TIMEOUT * HZ); > + u32 to = (CMD_TIMEOUT * HZ); > > retry: > cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL); > @@ -315,8 +315,7 @@ retry: > retry_cnt ? "re" : "", scsi_cmd[0]); > > result = scsi_execute(sdev, scsi_cmd, DMA_FROM_DEVICE, cmd_buf, > - CMD_BUFSIZE, sense_buf, tout, CMD_RETRIES, > - 0, NULL); > + CMD_BUFSIZE, sense_buf, to, CMD_RETRIES, 0, NULL); > > if (driver_byte(result) == DRIVER_SENSE) { > result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ > @@ -1376,8 +1375,8 @@ out_attach: > attach->block_size = gli->blk_len; > attach->mmio_size = sizeof(afu->afu_map->hosts[0].harea); > attach->last_lba = gli->max_lba; > - attach->max_xfer = (sdev->host->max_sectors * MAX_SECTOR_UNIT) / > - gli->blk_len; > + attach->max_xfer = (sdev->host->max_sectors * MAX_SECTOR_UNIT); > + attach->max_xfer /= gli->blk_len;
This change and the one above are not really part of the patch. Not a big deal, but in future would be good to either call out the fact that there are a couple of unrelated formatting changes, or keep them out and stick them in a separate cleanup patch. Reviewed-by: Brian King <brk...@linux.vnet.ibm.com> -- Brian King Power Linux I/O IBM Linux Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html