Skip to content

Commit 9aae1c1

Browse files
ching Huangmartinkpetersen
authored andcommitted
scsi: arcmsr: Remove unnecessary syntax
Remove unnecessary syntax. Link: https://lore.kernel.org/r/29486c1a50df3bb1312fb9d6a2dec075f212e4d5.camel@areca.com.tw Signed-off-by: ching Huang <ching2048@areca.com.tw> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 39a45d5 commit 9aae1c1

1 file changed

Lines changed: 18 additions & 45 deletions

File tree

drivers/scsi/arcmsr/arcmsr_hba.c

Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -317,20 +317,16 @@ static bool arcmsr_remap_pciregion(struct AdapterControlBlock *acb)
317317
static void arcmsr_unmap_pciregion(struct AdapterControlBlock *acb)
318318
{
319319
switch (acb->adapter_type) {
320-
case ACB_ADAPTER_TYPE_A:{
320+
case ACB_ADAPTER_TYPE_A:
321321
iounmap(acb->pmuA);
322-
}
323-
break;
324-
case ACB_ADAPTER_TYPE_B:{
322+
break;
323+
case ACB_ADAPTER_TYPE_B:
325324
iounmap(acb->mem_base0);
326325
iounmap(acb->mem_base1);
327-
}
328-
329-
break;
330-
case ACB_ADAPTER_TYPE_C:{
326+
break;
327+
case ACB_ADAPTER_TYPE_C:
331328
iounmap(acb->pmuC);
332-
}
333-
break;
329+
break;
334330
case ACB_ADAPTER_TYPE_D:
335331
iounmap(acb->mem_base0);
336332
break;
@@ -552,18 +548,14 @@ static void arcmsr_flush_adapter_cache(struct AdapterControlBlock *acb)
552548
{
553549
switch (acb->adapter_type) {
554550

555-
case ACB_ADAPTER_TYPE_A: {
551+
case ACB_ADAPTER_TYPE_A:
556552
arcmsr_hbaA_flush_cache(acb);
557-
}
558553
break;
559-
560-
case ACB_ADAPTER_TYPE_B: {
554+
case ACB_ADAPTER_TYPE_B:
561555
arcmsr_hbaB_flush_cache(acb);
562-
}
563556
break;
564-
case ACB_ADAPTER_TYPE_C: {
557+
case ACB_ADAPTER_TYPE_C:
565558
arcmsr_hbaC_flush_cache(acb);
566-
}
567559
break;
568560
case ACB_ADAPTER_TYPE_D:
569561
arcmsr_hbaD_flush_cache(acb);
@@ -1213,21 +1205,15 @@ static uint8_t arcmsr_abort_allcmd(struct AdapterControlBlock *acb)
12131205
{
12141206
uint8_t rtnval = 0;
12151207
switch (acb->adapter_type) {
1216-
case ACB_ADAPTER_TYPE_A: {
1208+
case ACB_ADAPTER_TYPE_A:
12171209
rtnval = arcmsr_hbaA_abort_allcmd(acb);
1218-
}
12191210
break;
1220-
1221-
case ACB_ADAPTER_TYPE_B: {
1211+
case ACB_ADAPTER_TYPE_B:
12221212
rtnval = arcmsr_hbaB_abort_allcmd(acb);
1223-
}
12241213
break;
1225-
1226-
case ACB_ADAPTER_TYPE_C: {
1214+
case ACB_ADAPTER_TYPE_C:
12271215
rtnval = arcmsr_hbaC_abort_allcmd(acb);
1228-
}
12291216
break;
1230-
12311217
case ACB_ADAPTER_TYPE_D:
12321218
rtnval = arcmsr_hbaD_abort_allcmd(acb);
12331219
break;
@@ -1916,18 +1902,14 @@ static void arcmsr_hbaE_stop_bgrb(struct AdapterControlBlock *pACB)
19161902
static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb)
19171903
{
19181904
switch (acb->adapter_type) {
1919-
case ACB_ADAPTER_TYPE_A: {
1905+
case ACB_ADAPTER_TYPE_A:
19201906
arcmsr_hbaA_stop_bgrb(acb);
1921-
}
19221907
break;
1923-
1924-
case ACB_ADAPTER_TYPE_B: {
1908+
case ACB_ADAPTER_TYPE_B:
19251909
arcmsr_hbaB_stop_bgrb(acb);
1926-
}
19271910
break;
1928-
case ACB_ADAPTER_TYPE_C: {
1911+
case ACB_ADAPTER_TYPE_C:
19291912
arcmsr_hbaC_stop_bgrb(acb);
1930-
}
19311913
break;
19321914
case ACB_ADAPTER_TYPE_D:
19331915
arcmsr_hbaD_stop_bgrb(acb);
@@ -1951,7 +1933,6 @@ static void arcmsr_iop_message_read(struct AdapterControlBlock *acb)
19511933
writel(ARCMSR_INBOUND_DRIVER_DATA_READ_OK, &reg->inbound_doorbell);
19521934
}
19531935
break;
1954-
19551936
case ACB_ADAPTER_TYPE_B: {
19561937
struct MessageUnit_B *reg = acb->pmuB;
19571938
writel(ARCMSR_DRV2IOP_DATA_READ_OK, reg->drv2iop_doorbell);
@@ -2034,7 +2015,6 @@ struct QBUFFER __iomem *arcmsr_get_iop_rqbuffer(struct AdapterControlBlock *acb)
20342015
qbuffer = (struct QBUFFER __iomem *)&reg->message_rbuffer;
20352016
}
20362017
break;
2037-
20382018
case ACB_ADAPTER_TYPE_B: {
20392019
struct MessageUnit_B *reg = acb->pmuB;
20402020
qbuffer = (struct QBUFFER __iomem *)reg->message_rbuffer;
@@ -2069,7 +2049,6 @@ static struct QBUFFER __iomem *arcmsr_get_iop_wqbuffer(struct AdapterControlBloc
20692049
pqbuffer = (struct QBUFFER __iomem *) &reg->message_wbuffer;
20702050
}
20712051
break;
2072-
20732052
case ACB_ADAPTER_TYPE_B: {
20742053
struct MessageUnit_B *reg = acb->pmuB;
20752054
pqbuffer = (struct QBUFFER __iomem *)reg->message_wbuffer;
@@ -2699,10 +2678,8 @@ static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb)
26992678
switch (acb->adapter_type) {
27002679
case ACB_ADAPTER_TYPE_A:
27012680
return arcmsr_hbaA_handle_isr(acb);
2702-
break;
27032681
case ACB_ADAPTER_TYPE_B:
27042682
return arcmsr_hbaB_handle_isr(acb);
2705-
break;
27062683
case ACB_ADAPTER_TYPE_C:
27072684
return arcmsr_hbaC_handle_isr(acb);
27082685
case ACB_ADAPTER_TYPE_D:
@@ -3634,18 +3611,14 @@ static int arcmsr_polling_ccbdone(struct AdapterControlBlock *acb,
36343611
int rtn = 0;
36353612
switch (acb->adapter_type) {
36363613

3637-
case ACB_ADAPTER_TYPE_A: {
3614+
case ACB_ADAPTER_TYPE_A:
36383615
rtn = arcmsr_hbaA_polling_ccbdone(acb, poll_ccb);
3639-
}
36403616
break;
3641-
3642-
case ACB_ADAPTER_TYPE_B: {
3617+
case ACB_ADAPTER_TYPE_B:
36433618
rtn = arcmsr_hbaB_polling_ccbdone(acb, poll_ccb);
3644-
}
36453619
break;
3646-
case ACB_ADAPTER_TYPE_C: {
3620+
case ACB_ADAPTER_TYPE_C:
36473621
rtn = arcmsr_hbaC_polling_ccbdone(acb, poll_ccb);
3648-
}
36493622
break;
36503623
case ACB_ADAPTER_TYPE_D:
36513624
rtn = arcmsr_hbaD_polling_ccbdone(acb, poll_ccb);

0 commit comments

Comments
 (0)