From patchwork Mon Jun 16 11:23:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan R X-Patchwork-Id: 31941 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2679020E7A for ; Mon, 16 Jun 2014 11:26:47 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id j17sf32058680oag.0 for ; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=YRs8dEe9iRDkmqqKf50uZNStdsBgXAhHiOW5UYrCrmc=; b=FCfvIp3X2Z+2yDDJfJXWeMhNK4qjEw7IEFQf0vz7ddfXXdTUNMrRggcUcDAeCl2sZN mtVO/PPk4cBueF/Z2NhUV9Zk8G3gcJOThNFtY6NM2p4db8tsYTx+VFsRXwMiT0Ht1J4h KFwhDbvVdsVOGqZTB4fLe8lHdNRSUwFDJHJKhltAMRuPOQWxMt3io6i4lyHKe+JitHhm QAw9NcagzITZMeLBlfL6SUOYli7yVWKzVhQCMwG3rMH0rC/KubFwclew2gqOBn4AIcdo HfL3EYIP+VkMpk4y7badRedJqxQ9WnCOVJ80O9HEsidE9PipbfIWXakrMBXcpVYqjKgH 9/vg== X-Gm-Message-State: ALoCoQmWOIv4z4+oo9MFXbZVBUAiRL02D3booc3tKx+CCMajq9Xgq2dzWbbNs/BLsWpyzxILM5M7 X-Received: by 10.182.73.200 with SMTP id n8mr637107obv.33.1402918006782; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.53 with SMTP id y50ls488440qgd.8.gmail; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) X-Received: by 10.52.96.8 with SMTP id do8mr13201306vdb.4.1402918006673; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id b8si3993322vcf.7.2014.06.16.04.26.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Jun 2014 04:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ij19so4727029vcb.37 for ; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) X-Received: by 10.58.122.138 with SMTP id ls10mr16346181veb.13.1402918006585; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp127300vcb; Mon, 16 Jun 2014 04:26:46 -0700 (PDT) X-Received: by 10.66.100.200 with SMTP id fa8mr23271803pab.23.1402918005639; Mon, 16 Jun 2014 04:26:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cw3si10621487pbc.117.2014.06.16.04.26.45; Mon, 16 Jun 2014 04:26:45 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755411AbaFPL0i (ORCPT + 8 others); Mon, 16 Jun 2014 07:26:38 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:37759 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755406AbaFPL0g (ORCPT ); Mon, 16 Jun 2014 07:26:36 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5GBPtCn029568; Mon, 16 Jun 2014 06:25:55 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5GBPtLG026018; Mon, 16 Jun 2014 06:25:55 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 16 Jun 2014 06:25:55 -0500 Received: from uda0393807.india.ti.com. (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5GBOx46008965; Mon, 16 Jun 2014 06:25:50 -0500 From: Sricharan R To: , , , CC: , , , , , , , , Subject: [PATCH V3 09/16] irqchip: crossbar: return proper error value Date: Mon, 16 Jun 2014 16:53:09 +0530 Message-ID: <1402917796-31574-10-git-send-email-r.sricharan@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402917796-31574-1-git-send-email-r.sricharan@ti.com> References: <1402917796-31574-1-git-send-email-r.sricharan@ti.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: r.sricharan@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Nishanth Menon crossbar_of_init always returns -ENOMEM in case of errors. There can be other causes of failure like invalid data from DT. So return a appropriate error value for that case. Signed-off-by: Nishanth Menon Signed-off-by: Sricharan R --- [V3] Changed commit log drivers/irqchip/irq-crossbar.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 6eee61b..5bcedc0 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -129,19 +129,25 @@ static const struct irq_domain_ops routable_irq_domain_ops = { static int __init crossbar_of_init(struct device_node *node) { - int i, size, max, reserved = 0, entry; + int i, size, max = 0, reserved = 0, entry; const __be32 *irqsr; + int ret = -ENOMEM; cb = kzalloc(sizeof(*cb), GFP_KERNEL); if (!cb) - return -ENOMEM; + return ret; cb->crossbar_base = of_iomap(node, 0); if (!cb->crossbar_base) goto err1; of_property_read_u32(node, "ti,max-irqs", &max); + if (!max) { + pr_err("missing 'ti,max-irqs' property\n"); + ret = -EINVAL; + goto err2; + } cb->irq_map = kcalloc(max, sizeof(int), GFP_KERNEL); if (!cb->irq_map) goto err2; @@ -162,6 +168,7 @@ static int __init crossbar_of_init(struct device_node *node) i, &entry); if (entry > max) { pr_err("Invalid reserved entry\n"); + ret = -EINVAL; goto err3; } cb->irq_map[entry] = IRQ_RESERVED; @@ -205,6 +212,7 @@ static int __init crossbar_of_init(struct device_node *node) break; default: pr_err("Invalid reg-size property\n"); + ret = -EINVAL; goto err4; break; } @@ -243,7 +251,7 @@ err2: iounmap(cb->crossbar_base); err1: kfree(cb); - return -ENOMEM; + return ret; } static const struct of_device_id crossbar_match[] __initconst = {