From patchwork Thu Jul 16 22:26:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 496927 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ECBFC140773 for ; Fri, 17 Jul 2015 08:26:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Jn6DeyhR; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755972AbbGPW0h (ORCPT ); Thu, 16 Jul 2015 18:26:37 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:35886 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbbGPW0f (ORCPT ); Thu, 16 Jul 2015 18:26:35 -0400 Received: by lagw2 with SMTP id w2so51607753lag.3 for ; Thu, 16 Jul 2015 15:26:34 -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:in-reply-to:references; bh=5liupxbODHIeZYgZw4DZ6i0a6pV29DajBTfNFVaCY7Y=; b=Jn6DeyhROmIqF1jJJpT6ar5h8awDwIsaVbFa+/DdAZM+wBkaf/qOPWC5T0MDmgJR+/ cgvPXSwyvobKrOXs0Ps6Mu+pDDVi93trAMZJupPSgtmxB1l1ifqaqRh9m+C2h2pWEqt0 qrk+274YfhivGe8B3IpUF7/aAKujoAYFc5e4wYQphqxi3WBeSb09cMW2sJ+J9oZkbOIg ex71GjxYjPAWt+TwWSv8U9p4gdKYSMyfxQO50NOGyopVMq/mHCLjC1U5g8lAjf1tU6NY As//m0gJRuUV9R/xTiAqJ4eD5iGziUPxanB9OP8Qdb64wMp/1X7IcjyDKhmOldcvV+g2 po3g== X-Received: by 10.152.3.199 with SMTP id e7mr11278682lae.98.1437085594341; Thu, 16 Jul 2015 15:26:34 -0700 (PDT) Received: from localhost.localdomain (141.89-11-213.nextgentel.com. [89.11.213.141]) by smtp.gmail.com with ESMTPSA id lb8sm2347138lab.16.2015.07.16.15.26.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jul 2015 15:26:33 -0700 (PDT) From: Joachim Eastwood To: peppe.cavallaro@st.com, davem@davemloft.net Cc: Joachim Eastwood , netdev@vger.kernel.org Subject: [PATCH net-next 1/8] stmmac: use of_device_get_match_data to retrieve of match data Date: Fri, 17 Jul 2015 00:26:05 +0200 Message-Id: <1437085572-11371-2-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1437085572-11371-1-git-send-email-manabian@gmail.com> References: <1437085572-11371-1-git-send-email-manabian@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By using of_device_get_match_data() the code that retrieve match data can be simplified quite a bit. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index f3918c7e7eeb..89e40ddc0391 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -109,13 +109,11 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) { struct device_node *np = pdev->dev.of_node; + const struct stmmac_of_data *data; struct stmmac_dma_cfg *dma_cfg; - const struct of_device_id *device; - struct device *dev = &pdev->dev; - device = of_match_device(dev->driver->of_match_table, dev); - if (device->data) { - const struct stmmac_of_data *data = device->data; + data = of_device_get_match_data(&pdev->dev); + if (data) { plat->has_gmac = data->has_gmac; plat->enh_desc = data->enh_desc; plat->tx_coe = data->tx_coe;