target: quark_x10xx: miscellaneous cleanups

Just some misc cleanups without any functional changes. It's just
easier to read.

Change-Id: I66bee31f297bcbdb8cc4446b774d7714fbaa7c83
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Reviewed-on: http://openocd.zylin.com/4015
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

diff --git a/src/target/quark_x10xx.c b/src/target/quark_x10xx.c
index b9a7c1656c3b8d07ea7a937f418790b86f05a3bf..525d39a02567502b68e21b84a19a22f29404cdaa 100644 (file)
--- a/src/target/quark_x10xx.c
+++ b/src/target/quark_x10xx.c
@@ -53,47 +53,45 @@
 
 static int quark_x10xx_target_create(struct target *t, Jim_Interp *interp)
 {
-       struct x86_32_common *x86_32 = calloc(1, sizeof(struct x86_32_common));
-       if (x86_32 == NULL) {
-               LOG_ERROR("%s out of memory", __func__);
+       struct x86_32_common *x86_32 = calloc(1, sizeof(*x86_32));
+
+       if (!x86_32)
                return ERROR_FAIL;
-       }
+
        x86_32_common_init_arch_info(t, x86_32);
        lakemont_init_arch_info(t, x86_32);
        x86_32->core_type = LMT1;
-       return ERROR_OK;
-}
 
-static int quark_x10xx_init_target(struct command_context *cmd_ctx,
-               struct target *t)
-{
-       return lakemont_init_target(cmd_ctx, t);
+       return ERROR_OK;
 }
 
 struct target_type quark_x10xx_target = {
-       .name = "quark_x10xx",
+       .name                   = "quark_x10xx",
+
        /* Quark X1000 SoC */
-       .target_create = quark_x10xx_target_create,
-       .init_target = quark_x10xx_init_target,
+       .target_create          = quark_x10xx_target_create,
+
        /* lakemont probemode specific code */
-       .poll = lakemont_poll,
-       .arch_state = lakemont_arch_state,
-       .halt = lakemont_halt,
-       .resume = lakemont_resume,
-       .step = lakemont_step,
-       .assert_reset = lakemont_reset_assert,
-       .deassert_reset = lakemont_reset_deassert,
+       .arch_state             = lakemont_arch_state,
+       .assert_reset           = lakemont_reset_assert,
+       .deassert_reset         = lakemont_reset_deassert,
+       .halt                   = lakemont_halt,
+       .init_target            = lakemont_init_target,
+       .poll                   = lakemont_poll,
+       .resume                 = lakemont_resume,
+       .step                   = lakemont_step,
+
        /* common x86 code */
-       .commands = x86_32_command_handlers,
-       .get_gdb_reg_list = x86_32_get_gdb_reg_list,
-       .read_memory = x86_32_common_read_memory,
-       .write_memory = x86_32_common_write_memory,
-       .add_breakpoint = x86_32_common_add_breakpoint,
-       .remove_breakpoint = x86_32_common_remove_breakpoint,
-       .add_watchpoint = x86_32_common_add_watchpoint,
-       .remove_watchpoint = x86_32_common_remove_watchpoint,
-       .virt2phys = x86_32_common_virt2phys,
-       .read_phys_memory = x86_32_common_read_phys_mem,
-       .write_phys_memory = x86_32_common_write_phys_mem,
-       .mmu = x86_32_common_mmu,
+       .add_breakpoint         = x86_32_common_add_breakpoint,
+       .add_watchpoint         = x86_32_common_add_watchpoint,
+       .commands               = x86_32_command_handlers,
+       .get_gdb_reg_list       = x86_32_get_gdb_reg_list,
+       .mmu                    = x86_32_common_mmu,
+       .read_memory            = x86_32_common_read_memory,
+       .read_phys_memory       = x86_32_common_read_phys_mem,
+       .remove_breakpoint      = x86_32_common_remove_breakpoint,
+       .remove_watchpoint      = x86_32_common_remove_watchpoint,
+       .virt2phys              = x86_32_common_virt2phys,
+       .write_memory           = x86_32_common_write_memory,
+       .write_phys_memory      = x86_32_common_write_phys_mem,
 };