On 10/27/2014 06:26 AM, Finn Thain wrote: > Compile-time override of scsi host defaults is pointless for drivers that > provide module parameters and __setup options for that. Too many macros make > the code hard to read so remove them. > > Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/scsi/atari_scsi.c | 2 +- > drivers/scsi/atari_scsi.h | 3 --- > drivers/scsi/mac_scsi.c | 19 +++++++++---------- > drivers/scsi/mac_scsi.h | 16 ---------------- > drivers/scsi/sun3_scsi.c | 20 ++++++++++---------- > drivers/scsi/sun3_scsi.h | 18 ------------------ > 6 files changed, 20 insertions(+), 58 deletions(-) > > Index: linux/drivers/scsi/mac_scsi.c > =================================================================== > --- linux.orig/drivers/scsi/mac_scsi.c 2014-10-27 16:25:26.000000000 +1100 > +++ linux/drivers/scsi/mac_scsi.c 2014-10-27 16:25:32.000000000 +1100 > @@ -177,13 +177,12 @@ int __init macscsi_detect(struct scsi_ho > if (macintosh_config->scsi_type != MAC_SCSI_OLD) > return( 0 ); > > - /* setup variables */ > - tpnt->can_queue = > - (setup_can_queue > 0) ? setup_can_queue : CAN_QUEUE; > - tpnt->cmd_per_lun = > - (setup_cmd_per_lun > 0) ? setup_cmd_per_lun : CMD_PER_LUN; > - tpnt->sg_tablesize = > - (setup_sg_tablesize >= 0) ? setup_sg_tablesize : SG_TABLESIZE; > + if (setup_can_queue > 0) > + tpnt->can_queue = setup_can_queue; > + if (setup_cmd_per_lun > 0) > + tpnt->cmd_per_lun = setup_cmd_per_lun; > + if (setup_sg_tablesize >= 0) > + tpnt->sg_tablesize = setup_sg_tablesize; > > if (setup_hostid >= 0) > tpnt->this_id = setup_hostid; Sigh. Blasted indentation. Can I convince you to cleanup mac_scsi.c to conform to current coding style after the cleanup is done? The remainder is okay. Reviewed-by: Hannes Reinecke <hare@xxxxxxx> Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@xxxxxxx +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
