From: Johannes Schilling Date: Thu, 6 Jun 2013 16:10:46 +0000 (+0200) Subject: keucr: use more specific max_t(int, .. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fb91d1128ff8a211f0a2b4dec9ad34d33ce6316;p=linux-beck.git keucr: use more specific max_t(int, .. as advised by checkpatch, changed generic max(..) to max_t(int, .. Signed-off-by: Laura Lawniczak Signed-off-by: Johannes Schilling Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c index 1a8837df0766..ab1eccdee583 100644 --- a/drivers/staging/keucr/transport.c +++ b/drivers/staging/keucr/transport.c @@ -708,8 +708,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us) } else { residue = min(residue, transfer_length); - scsi_set_resid(srb, max(scsi_get_resid(srb), - (int) residue)); + scsi_set_resid(srb, max_t(int, scsi_get_resid(srb), + residue)); } }