浏览代码

[SCSI] drivers/scsi: Adjust confusing if indentation

Outdent the code following the if.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Nick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Julia Lawall 15 年之前
父节点
当前提交
7968f1944c
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      drivers/scsi/arcmsr/arcmsr_hba.c
  2. 1 1
      drivers/scsi/mpt2sas/mpt2sas_base.c

+ 2 - 2
drivers/scsi/arcmsr/arcmsr_hba.c

@@ -878,8 +878,8 @@ static void arcmsr_report_ccb_state(struct AdapterControlBlock *acb,
 	if (!error) {
 	if (!error) {
 		if (acb->devstate[id][lun] == ARECA_RAID_GONE)
 		if (acb->devstate[id][lun] == ARECA_RAID_GONE)
 			acb->devstate[id][lun] = ARECA_RAID_GOOD;
 			acb->devstate[id][lun] = ARECA_RAID_GOOD;
-			ccb->pcmd->result = DID_OK << 16;
-			arcmsr_ccb_complete(ccb);
+		ccb->pcmd->result = DID_OK << 16;
+		arcmsr_ccb_complete(ccb);
 	}else{
 	}else{
 		switch (ccb->arcmsr_cdb.DeviceStatus) {
 		switch (ccb->arcmsr_cdb.DeviceStatus) {
 		case ARCMSR_DEV_SELECT_TIMEOUT: {
 		case ARCMSR_DEV_SELECT_TIMEOUT: {

+ 1 - 1
drivers/scsi/mpt2sas/mpt2sas_base.c

@@ -534,7 +534,7 @@ _base_display_event_data(struct MPT2SAS_ADAPTER *ioc,
 		if (event_data->DiscoveryStatus)
 		if (event_data->DiscoveryStatus)
 			printk("discovery_status(0x%08x)",
 			printk("discovery_status(0x%08x)",
 			    le32_to_cpu(event_data->DiscoveryStatus));
 			    le32_to_cpu(event_data->DiscoveryStatus));
-			printk("\n");
+		printk("\n");
 		return;
 		return;
 	}
 	}
 	case MPI2_EVENT_SAS_BROADCAST_PRIMITIVE:
 	case MPI2_EVENT_SAS_BROADCAST_PRIMITIVE: