From patchwork Mon Jul 23 07:28:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1226511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id ACD623FCFC for ; Mon, 23 Jul 2012 07:33:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1StD4r-0005B5-8D; Mon, 23 Jul 2012 07:29:13 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1StD4l-0005AC-JR for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2012 07:29:08 +0000 Received: by bkcji2 with SMTP id ji2so4670816bkc.36 for ; Mon, 23 Jul 2012 00:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=rRFcRv3pwfWJxnmwd9Gn4Ozdf9ak+lD3CFWG8eKiJ0c=; b=BguQBwuV/641zZYPrwwb46+hNNdIW/M44OB5XqenlDPsKTC56SXKly1sWvnzz8sGtj zSqJgcNogga5uU4p1C9mRbGg0+BicqouBNUdbtQoO20FXBw0dzPZY+1P6LGP038GWB62 TN6PtIySJ+S8Vxu7RiLMujxcD8671ql4e9EbzOS5+huRUX+E3fs22Yxz814V2CQ6JX1R 79GsruRgUIWsIoLYpBPvnFJE4bQEtnLn8lACjRmWBMOXr8b8zHUAPceipyJ5MH0nWU2O JtqeBdWJhTN9PifdOS63qz07N+ZTdZ8OH32esrIQ7EOk2LFhjxXSs4sK9PjMK2rd99qJ OeQQ== Received: by 10.204.153.10 with SMTP id i10mr7055508bkw.67.1343028545475; Mon, 23 Jul 2012 00:29:05 -0700 (PDT) Received: from localhost.localdomain (206.74.63.81.cust.bluewin.ch. [81.63.74.206]) by mx.google.com with ESMTPS id he8sm6167430bkc.3.2012.07.23.00.29.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jul 2012 00:29:04 -0700 (PDT) From: Fabio Estevam To: shawn.guo@linaro.org Subject: [PATCH] ARM: mxs: Adjust of_find_property() Date: Mon, 23 Jul 2012 04:28:58 -0300 Message-Id: <1343028538-13891-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Fabio Estevam Since commit 475d00 (of: Improve prom_update_property() function) prom_update_property requires two arguments. Fix this in order to get rid of the following build error: arch/arm/mach-mxs/mach-mxs.c:175:4: error: too many arguments to function 'prom_update_property' Signed-off-by: Fabio Estevam --- arch/arm/mach-mxs/mach-mxs.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 648bdd0..b70011d 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -162,7 +162,7 @@ enum mac_oui { static void __init update_fec_mac_prop(enum mac_oui oui) { struct device_node *np, *from = NULL; - struct property *oldmac, *newmac; + struct property *newmac; const u32 *ocotp = mxs_get_ocotp(); u8 *macaddr; u32 val; @@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui) macaddr[4] = (val >> 8) & 0xff; macaddr[5] = (val >> 0) & 0xff; - oldmac = of_find_property(np, newmac->name, NULL); - if (oldmac) - prom_update_property(np, newmac, oldmac); - else - prom_add_property(np, newmac); + prom_add_property(np, newmac); } }