Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: db8500-prcmu: Return early if the TCPM cannot be located

Currently we check to see if we obtained the Tightly Coupled Program
Memory (TCPM) base and only execute the code within the check if we
have it. It's more traditional to return early if we don't have it.
This way we can flatten most of the function's code down to a single
tab spacing.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Lee Jones and committed by
Samuel Ortiz
741cdecf 5fb1c2dd

+21 -19
+21 -19
drivers/mfd/db8500-prcmu.c
··· 2704 2704 { 2705 2705 struct resource *res; 2706 2706 void __iomem *tcpm_base; 2707 + u32 version; 2707 2708 2708 2709 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, 2709 2710 "prcmu-tcpm"); ··· 2714 2713 return; 2715 2714 } 2716 2715 tcpm_base = ioremap(res->start, resource_size(res)); 2717 - if (tcpm_base != NULL) { 2718 - u32 version; 2719 - 2720 - version = readl(tcpm_base + version_offset); 2721 - fw_info.version.project = (version & 0xFF); 2722 - fw_info.version.api_version = (version >> 8) & 0xFF; 2723 - fw_info.version.func_version = (version >> 16) & 0xFF; 2724 - fw_info.version.errata = (version >> 24) & 0xFF; 2725 - strncpy(fw_info.version.project_name, 2726 - fw_project_name(fw_info.version.project), 2727 - PRCMU_FW_PROJECT_NAME_LEN); 2728 - fw_info.valid = true; 2729 - pr_info("PRCMU firmware: %s(%d), version %d.%d.%d\n", 2730 - fw_info.version.project_name, 2731 - fw_info.version.project, 2732 - fw_info.version.api_version, 2733 - fw_info.version.func_version, 2734 - fw_info.version.errata); 2735 - iounmap(tcpm_base); 2716 + if (!tcpm_base) { 2717 + dev_err(&pdev->dev, "no prcmu tcpm mem region provided\n"); 2718 + return; 2736 2719 } 2720 + 2721 + version = readl(tcpm_base + version_offset); 2722 + fw_info.version.project = (version & 0xFF); 2723 + fw_info.version.api_version = (version >> 8) & 0xFF; 2724 + fw_info.version.func_version = (version >> 16) & 0xFF; 2725 + fw_info.version.errata = (version >> 24) & 0xFF; 2726 + strncpy(fw_info.version.project_name, 2727 + fw_project_name(fw_info.version.project), 2728 + PRCMU_FW_PROJECT_NAME_LEN); 2729 + fw_info.valid = true; 2730 + pr_info("PRCMU firmware: %s(%d), version %d.%d.%d\n", 2731 + fw_info.version.project_name, 2732 + fw_info.version.project, 2733 + fw_info.version.api_version, 2734 + fw_info.version.func_version, 2735 + fw_info.version.errata); 2736 + iounmap(tcpm_base); 2737 2737 } 2738 2738 2739 2739 void __init db8500_prcmu_early_init(u32 phy_base, u32 size)