From patchwork Mon Jul 6 18:54:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 491780 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A17241402D4 for ; Tue, 7 Jul 2015 04:57:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=JPHK3F/a; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 01E644B84E; Mon, 6 Jul 2015 20:57:13 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sw4xV7KK81KK; Mon, 6 Jul 2015 20:57:12 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3547E4B83C; Mon, 6 Jul 2015 20:56:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76BCD4B792 for ; Mon, 6 Jul 2015 20:55:41 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a6e4xG4k5LAy for ; Mon, 6 Jul 2015 20:55:41 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f173.google.com (mail-ig0-f173.google.com [209.85.213.173]) by theia.denx.de (Postfix) with ESMTPS id D58E94B7CA for ; Mon, 6 Jul 2015 20:55:24 +0200 (CEST) Received: by igau2 with SMTP id u2so18812717iga.0 for ; Mon, 06 Jul 2015 11:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7jSkCJUXGMsZm1vyteZ7vQz3Ds4JS1nWLuRhuC3AYjw=; b=JPHK3F/a0QlXCBrIPWf2QH/zUMllx8AkznBC4QKVF7uurDRBU6YgrePbvUuK0/a1Zm FuZmiKnjqEfAyC0MloM6fOkfcKGStLPRlWfUDTce4aNpO4IhdgtRAre048hjLWja9mGa e5lemV6T1iu/eM+zfZB+KFzh5oxm1dZzsrN4VC2t12WHkLPH6/Tc4TnJH76GmEL3hJGF g1q05FC9Oeh3y49zCROon3rOtpHDsJIBknc5uUxiaMpkW77ZlpZwfQKDlV9nMSlhLeq3 JXfQcLbQ1g2lDvuTgEcC6mPhNtdMov6bOZmlFf2qswaBc01ge1Dp3jXoE5dNK0QjlPYp peWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7jSkCJUXGMsZm1vyteZ7vQz3Ds4JS1nWLuRhuC3AYjw=; b=Z7N8iYH+fuxl8fEVxJSRvAaKlbi9OFcXjOu4pMKzGH+clHmLDeMqf5jBCGDyfSCrXW LC3kutLS0OwTCbNLv+e0kWfTzerPVB5gLDmAoxcR+ECDtWwLDLtpmXa8nobTZibYOKn0 1s5eqcSsDMS3lZWJXsXlfDrj7f2lgSU7HWrWqDmGo0GfEnZoa6s5t7eAE5hp3cJfFQVe im8dvtT/wPctfpdla3xS8V/sEO87D7DGUw0zqkJVjrUiDE0X3G0DF74esAiTkIoaa7DI 7PRIPMlMj1JxK1rH4KFsRI5DP5XxmoWLuSRFokIff34BOYXKdIGV/NHrIYLLdTyRWrPe QOrw== X-Gm-Message-State: ALoCoQmNwNDsSxhAtw15Ln+/zvyjrjnuejAz+oKnz5jtYGymLs86rjqu0QbdBk7JDSYBeB9ZeiFn X-Received: by 10.43.163.129 with SMTP id mo1mr34725525icc.61.1436208923658; Mon, 06 Jul 2015 11:55:23 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by mx.google.com with ESMTPSA id 191sm12987236iof.18.2015.07.06.11.55.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 11:55:20 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 3AB29221031; Mon, 6 Jul 2015 12:55:15 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 6 Jul 2015 12:54:38 -0600 Message-Id: <1436208879-8431-18-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.4.3.573.g4eafbef In-Reply-To: <1436208879-8431-1-git-send-email-sjg@chromium.org> References: <1436208879-8431-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH 17/18] dm: core: Add device checking to syscon_get_regmap() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This function can only handle a syscon device. It is possible that someone will make a mistake, so add a check for this. Also we should return -ENODEV when a device cannot be found, so update the syscon_get_regmap_by_driver_data() to follow this convention. Signed-off-by: Simon Glass --- drivers/core/syscon-uclass.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 4d66bb5..686c320 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -17,8 +17,11 @@ struct regmap *syscon_get_regmap(struct udevice *dev) { - struct syscon_uc_info *priv = dev_get_uclass_priv(dev); + struct syscon_uc_info *priv; + if (device_get_uclass_id(dev) != UCLASS_SYSCON) + return ERR_PTR(-ENOEXEC); + priv = dev_get_uclass_priv(dev); return priv->regmap; } @@ -52,7 +55,7 @@ struct regmap *syscon_get_regmap_by_driver_data(ulong driver_data) } } - return ERR_PTR(-ENOENT); + return ERR_PTR(-ENODEV); } void *syscon_get_first_range(ulong driver_data)