Commit d0a1a4b0 authored by Simon Sandström's avatar Simon Sandström Committed by Greg Kroah-Hartman

staging: kpc2000: fix invalid linebreaks in cell_probe.c

Fixes checkpatch.pl error "else should follow close brace '}'" and
"trailing statements should be on next line".
Signed-off-by: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e55c49b8
...@@ -85,8 +85,12 @@ static ...@@ -85,8 +85,12 @@ static
void parse_core_table_entry(struct core_table_entry *cte, const u64 read_val, const u8 entry_rev) void parse_core_table_entry(struct core_table_entry *cte, const u64 read_val, const u8 entry_rev)
{ {
switch (entry_rev) { switch (entry_rev) {
case 0: parse_core_table_entry_v0(cte, read_val); break; case 0:
default: cte->type = 0; break; parse_core_table_entry_v0(cte, read_val);
break;
default:
cte->type = 0;
break;
} }
} }
...@@ -387,7 +391,8 @@ static int kp2000_setup_dma_controller(struct kp2000_device *pcard) ...@@ -387,7 +391,8 @@ static int kp2000_setup_dma_controller(struct kp2000_device *pcard)
capabilities_reg = readq( pcard->dma_bar_base + KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i) ); capabilities_reg = readq( pcard->dma_bar_base + KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i) );
if (capabilities_reg & ENGINE_CAP_PRESENT_MASK) { if (capabilities_reg & ENGINE_CAP_PRESENT_MASK) {
err = create_dma_engine_core(pcard, (KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), i, pcard->pdev->irq); err = create_dma_engine_core(pcard, (KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), i, pcard->pdev->irq);
if (err) goto err_out; if (err)
goto err_out;
} }
} }
// C2S Engines // C2S Engines
...@@ -395,7 +400,8 @@ static int kp2000_setup_dma_controller(struct kp2000_device *pcard) ...@@ -395,7 +400,8 @@ static int kp2000_setup_dma_controller(struct kp2000_device *pcard)
capabilities_reg = readq( pcard->dma_bar_base + KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i) ); capabilities_reg = readq( pcard->dma_bar_base + KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i) );
if (capabilities_reg & ENGINE_CAP_PRESENT_MASK) { if (capabilities_reg & ENGINE_CAP_PRESENT_MASK) {
err = create_dma_engine_core(pcard, (KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), 32+i, pcard->pdev->irq); err = create_dma_engine_core(pcard, (KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), 32+i, pcard->pdev->irq);
if (err) goto err_out; if (err)
goto err_out;
} }
} }
...@@ -418,7 +424,8 @@ int kp2000_probe_cores(struct kp2000_device *pcard) ...@@ -418,7 +424,8 @@ int kp2000_probe_cores(struct kp2000_device *pcard)
dev_dbg(&pcard->pdev->dev, "kp2000_probe_cores(pcard = %p / %d)\n", pcard, pcard->card_num); dev_dbg(&pcard->pdev->dev, "kp2000_probe_cores(pcard = %p / %d)\n", pcard, pcard->card_num);
err = kp2000_setup_dma_controller(pcard); err = kp2000_setup_dma_controller(pcard);
if (err) return err; if (err)
return err;
INIT_LIST_HEAD(&pcard->uio_devices_list); INIT_LIST_HEAD(&pcard->uio_devices_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment