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

staging: ccree: Fix alignment issues in ssi_driver.c

Fixes checkpatch.pl alignment warnings.
Signed-off-by: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22aa4c93
...@@ -85,8 +85,7 @@ void dump_byte_array(const char *name, const u8 *the_array, unsigned long size) ...@@ -85,8 +85,7 @@ void dump_byte_array(const char *name, const u8 *the_array, unsigned long size)
return; return;
} }
ret = snprintf(line_buf, sizeof(line_buf), "%s[%lu]: ", ret = snprintf(line_buf, sizeof(line_buf), "%s[%lu]: ", name, size);
name, size);
if (ret < 0) { if (ret < 0) {
SSI_LOG_ERR("snprintf returned %d . aborting buffer array dump\n", ret); SSI_LOG_ERR("snprintf returned %d . aborting buffer array dump\n", ret);
return; return;
...@@ -95,8 +94,8 @@ void dump_byte_array(const char *name, const u8 *the_array, unsigned long size) ...@@ -95,8 +94,8 @@ void dump_byte_array(const char *name, const u8 *the_array, unsigned long size)
for (i = 0, cur_byte = the_array; for (i = 0, cur_byte = the_array;
(i < size) && (line_offset < sizeof(line_buf)); i++, cur_byte++) { (i < size) && (line_offset < sizeof(line_buf)); i++, cur_byte++) {
ret = snprintf(line_buf + line_offset, ret = snprintf(line_buf + line_offset,
sizeof(line_buf) - line_offset, sizeof(line_buf) - line_offset,
"0x%02X ", *cur_byte); "0x%02X ", *cur_byte);
if (ret < 0) { if (ret < 0) {
SSI_LOG_ERR("snprintf returned %d . aborting buffer array dump\n", ret); SSI_LOG_ERR("snprintf returned %d . aborting buffer array dump\n", ret);
return; return;
...@@ -193,11 +192,11 @@ int init_cc_regs(struct ssi_drvdata *drvdata, bool is_probe) ...@@ -193,11 +192,11 @@ int init_cc_regs(struct ssi_drvdata *drvdata, bool is_probe)
#ifdef DX_IRQ_DELAY #ifdef DX_IRQ_DELAY
/* Set CC IRQ delay */ /* Set CC IRQ delay */
CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL), CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL),
DX_IRQ_DELAY); DX_IRQ_DELAY);
#endif #endif
if (CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL)) > 0) { if (CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL)) > 0) {
SSI_LOG_DEBUG("irq_delay=%d CC cycles\n", SSI_LOG_DEBUG("irq_delay=%d CC cycles\n",
CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL))); CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL)));
} }
#endif #endif
...@@ -252,9 +251,9 @@ static int init_cc_resources(struct platform_device *plat_dev) ...@@ -252,9 +251,9 @@ static int init_cc_resources(struct platform_device *plat_dev)
goto init_cc_res_err; goto init_cc_res_err;
} }
SSI_LOG_DEBUG("Got MEM resource (%s): start=0x%llX end=0x%llX\n", SSI_LOG_DEBUG("Got MEM resource (%s): start=0x%llX end=0x%llX\n",
new_drvdata->res_mem->name, new_drvdata->res_mem->name,
(unsigned long long)new_drvdata->res_mem->start, (unsigned long long)new_drvdata->res_mem->start,
(unsigned long long)new_drvdata->res_mem->end); (unsigned long long)new_drvdata->res_mem->end);
/* Map registers space */ /* Map registers space */
req_mem_cc_regs = request_mem_region(new_drvdata->res_mem->start, resource_size(new_drvdata->res_mem), "arm_cc7x_regs"); req_mem_cc_regs = request_mem_region(new_drvdata->res_mem->start, resource_size(new_drvdata->res_mem), "arm_cc7x_regs");
if (unlikely(!req_mem_cc_regs)) { if (unlikely(!req_mem_cc_regs)) {
...@@ -266,7 +265,8 @@ static int init_cc_resources(struct platform_device *plat_dev) ...@@ -266,7 +265,8 @@ static int init_cc_resources(struct platform_device *plat_dev)
cc_base = ioremap(new_drvdata->res_mem->start, resource_size(new_drvdata->res_mem)); cc_base = ioremap(new_drvdata->res_mem->start, resource_size(new_drvdata->res_mem));
if (unlikely(!cc_base)) { if (unlikely(!cc_base)) {
SSI_LOG_ERR("ioremap[CC](0x%08X,0x%08X) failed\n", SSI_LOG_ERR("ioremap[CC](0x%08X,0x%08X) failed\n",
(unsigned int)new_drvdata->res_mem->start, (unsigned int)resource_size(new_drvdata->res_mem)); (unsigned int)new_drvdata->res_mem->start,
(unsigned int)resource_size(new_drvdata->res_mem));
rc = -ENOMEM; rc = -ENOMEM;
goto init_cc_res_err; goto init_cc_res_err;
} }
...@@ -284,15 +284,15 @@ static int init_cc_resources(struct platform_device *plat_dev) ...@@ -284,15 +284,15 @@ static int init_cc_resources(struct platform_device *plat_dev)
IRQF_SHARED, "arm_cc7x", new_drvdata); IRQF_SHARED, "arm_cc7x", new_drvdata);
if (unlikely(rc != 0)) { if (unlikely(rc != 0)) {
SSI_LOG_ERR("Could not register to interrupt %llu\n", SSI_LOG_ERR("Could not register to interrupt %llu\n",
(unsigned long long)new_drvdata->res_irq->start); (unsigned long long)new_drvdata->res_irq->start);
goto init_cc_res_err; goto init_cc_res_err;
} }
init_completion(&new_drvdata->icache_setup_completion); init_completion(&new_drvdata->icache_setup_completion);
irq_registered = true; irq_registered = true;
SSI_LOG_DEBUG("Registered to IRQ (%s) %llu\n", SSI_LOG_DEBUG("Registered to IRQ (%s) %llu\n",
new_drvdata->res_irq->name, new_drvdata->res_irq->name,
(unsigned long long)new_drvdata->res_irq->start); (unsigned long long)new_drvdata->res_irq->start);
new_drvdata->plat_dev = plat_dev; new_drvdata->plat_dev = plat_dev;
...@@ -310,7 +310,7 @@ static int init_cc_resources(struct platform_device *plat_dev) ...@@ -310,7 +310,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
signature_val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_SIGNATURE)); signature_val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_SIGNATURE));
if (signature_val != DX_DEV_SIGNATURE) { if (signature_val != DX_DEV_SIGNATURE) {
SSI_LOG_ERR("Invalid CC signature: SIGNATURE=0x%08X != expected=0x%08X\n", SSI_LOG_ERR("Invalid CC signature: SIGNATURE=0x%08X != expected=0x%08X\n",
signature_val, (u32)DX_DEV_SIGNATURE); signature_val, (u32)DX_DEV_SIGNATURE);
rc = -EINVAL; rc = -EINVAL;
goto init_cc_res_err; goto init_cc_res_err;
} }
...@@ -431,7 +431,7 @@ static int init_cc_resources(struct platform_device *plat_dev) ...@@ -431,7 +431,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
new_drvdata->cc_base = NULL; new_drvdata->cc_base = NULL;
} }
release_mem_region(new_drvdata->res_mem->start, release_mem_region(new_drvdata->res_mem->start,
resource_size(new_drvdata->res_mem)); resource_size(new_drvdata->res_mem));
new_drvdata->res_mem = NULL; new_drvdata->res_mem = NULL;
} }
kfree(new_drvdata); kfree(new_drvdata);
...@@ -474,7 +474,7 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) ...@@ -474,7 +474,7 @@ static void cleanup_cc_resources(struct platform_device *plat_dev)
if (drvdata->cc_base) { if (drvdata->cc_base) {
iounmap(drvdata->cc_base); iounmap(drvdata->cc_base);
release_mem_region(drvdata->res_mem->start, release_mem_region(drvdata->res_mem->start,
resource_size(drvdata->res_mem)); resource_size(drvdata->res_mem));
drvdata->cc_base = NULL; drvdata->cc_base = NULL;
drvdata->res_mem = NULL; drvdata->res_mem = NULL;
} }
...@@ -519,12 +519,12 @@ static int cc7x_probe(struct platform_device *plat_dev) ...@@ -519,12 +519,12 @@ static int cc7x_probe(struct platform_device *plat_dev)
asm volatile("mrc p15, 0, %0, c0, c0, 1" : "=r" (ctr)); asm volatile("mrc p15, 0, %0, c0, c0, 1" : "=r" (ctr));
cacheline_size = 4 << ((ctr >> 16) & 0xf); cacheline_size = 4 << ((ctr >> 16) & 0xf);
SSI_LOG_DEBUG("CP15(L1_CACHE_BYTES) = %u , Kconfig(L1_CACHE_BYTES) = %u\n", SSI_LOG_DEBUG("CP15(L1_CACHE_BYTES) = %u , Kconfig(L1_CACHE_BYTES) = %u\n",
cacheline_size, L1_CACHE_BYTES); cacheline_size, L1_CACHE_BYTES);
asm volatile("mrc p15, 0, %0, c0, c0, 0" : "=r" (ctr)); asm volatile("mrc p15, 0, %0, c0, c0, 0" : "=r" (ctr));
SSI_LOG_DEBUG("Main ID register (MIDR): Implementer 0x%02X, Arch 0x%01X," SSI_LOG_DEBUG("Main ID register (MIDR): Implementer 0x%02X, Arch 0x%01X, Part 0x%03X, Rev r%dp%d\n",
" Part 0x%03X, Rev r%dp%d\n", (ctr >> 24), (ctr >> 16) & 0xF, (ctr >> 4) & 0xFFF,
(ctr >> 24), (ctr >> 16) & 0xF, (ctr >> 4) & 0xFFF, (ctr >> 20) & 0xF, ctr & 0xF); (ctr >> 20) & 0xF, ctr & 0xF);
#endif #endif
/* Map registers space */ /* Map registers space */
......
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