From patchwork Thu Jun 28 14:32:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10494085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82893603EE for ; Thu, 28 Jun 2018 14:34:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B7702A4CB for ; Thu, 28 Jun 2018 14:34:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E04A2A4DB; Thu, 28 Jun 2018 14:34:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 014022A4CB for ; Thu, 28 Jun 2018 14:34:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966768AbeF1Odh (ORCPT ); Thu, 28 Jun 2018 10:33:37 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:51729 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966752AbeF1Odd (ORCPT ); Thu, 28 Jun 2018 10:33:33 -0400 Received: by mail-wm0-f66.google.com with SMTP id w137-v6so9997185wmw.1 for ; Thu, 28 Jun 2018 07:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u5DqzgH5fpoGJX2DCfyjILWRGPoFwgDmrRb4Q1YR2bg=; b=avxoCEE4QJ/1RiiO71By+2CyB3Mkle0FZa4lUddlodouvRIrICFb2EMU2RDQnSv5GP dL9SWq7WzTZBDsHwqpxxD06sNk4nFI8zLbom+l97Im5vbgGUeBaP3n0U8oF8cJ4qwQDo 7lD8hEL5badTFuOeURDvRC8Umt8n/hwSr+Qe4L4uO1E/2mlz/aGtFRR6vK5p2XA2MW67 ynkv9T3hxwFcYntO2r6J9lLaslAEgYp038rq4mFr7UV6Na6ArIYbfsy6kDVp0pV/bmNG ZnH962fw7LVZs1sTm2npL9zKwEOPeEX0iGJn/9SyOhkg0XFJ8MfVFQSUxPEID2t05jGR RbdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u5DqzgH5fpoGJX2DCfyjILWRGPoFwgDmrRb4Q1YR2bg=; b=cWnySSjpDzD4o58z5BANW+ire1NOg8ikZXVt2oYi0rY3Vz2vpNmpwFdRlRMatMamVJ g3O9N1HYfXQsZTl7Nt1XtSwYFUONzwjryAKIoDQAnB00JEnYcDzPW8gI5Hf9pHswt+TT rNACoUNl+dxPbtU7IJgaJn2UcEvfpgEzRuWdXRfsMl/eR6p2B0MSHZyxSC0BrfcW/lHj DGwbQ+fokGI22oaZs0Hh8BTYAGjW8b/T9pfbhAILPvAH7li0iR9xzR9y7kuQBWwSi8sm 20HSCWqRIImPQLfK0qlygfVmx/8x/FaTodHJST1PS0Z1RSx/46jfZtBehQdDtcMIbVN6 LoAQ== X-Gm-Message-State: APt69E3jEf5P9fK9PHEa+qNl1WLaOQWZpE9L/1UunPQsCvF+aSfddGF3 IJf2AAyHrkzfe1WecFtbV8b6kA== X-Google-Smtp-Source: AAOMgpfQmNHKoYe8AnwffT/isojpj6bGzeqK19Zy+LdthNqxjEprTQ5NJKML95B0xOFzr9MpEUYydQ== X-Received: by 2002:a1c:2442:: with SMTP id k63-v6mr6223242wmk.7.1530196412122; Thu, 28 Jun 2018 07:33:32 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-87-41.w90-86.abo.wanadoo.fr. [90.86.29.41]) by smtp.gmail.com with ESMTPSA id 4-v6sm8037499wmh.14.2018.06.28.07.33.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 07:33:31 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Russell King , Grygorii Strashko , "David S . Miller" , Srinivas Kandagatla , Lukas Wunner , Rob Herring , Florian Fainelli , Dan Carpenter , Ivan Khoronzhuk , David Lechner , Greg Kroah-Hartman , Andrew Lunn , Jonathan Corbet Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, netdev@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 18/18] ARM: davinci: remove dead code related to MAC address reading Date: Thu, 28 Jun 2018 16:32:44 +0200 Message-Id: <20180628143244.4561-19-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628143244.4561-1-brgl@bgdev.pl> References: <20180628143244.4561-1-brgl@bgdev.pl> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski There are no more users of davinci_get_mac_addr(). Remove it. Also remove the mac_addr field from the emac platform data struct. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/common.c | 15 --------------- include/linux/davinci_emac.h | 2 -- 2 files changed, 17 deletions(-) diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index bcb6a7ba84e9..0c6cc354a4aa 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -28,21 +28,6 @@ EXPORT_SYMBOL(davinci_soc_info); void __iomem *davinci_intc_base; int davinci_intc_type; -void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context) -{ - char *mac_addr = davinci_soc_info.emac_pdata->mac_addr; - off_t offset = (off_t)context; - - if (!IS_BUILTIN(CONFIG_NVMEM)) { - pr_warn("Cannot read MAC addr from EEPROM without CONFIG_NVMEM\n"); - return; - } - - /* Read MAC addr from EEPROM */ - if (nvmem_device_read(nvmem, offset, ETH_ALEN, mac_addr) == ETH_ALEN) - pr_info("Read MAC addr from EEPROM: %pM\n", mac_addr); -} - static int __init davinci_init_id(struct davinci_soc_info *soc_info) { int i; diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h index 05b97144d342..19888b27706d 100644 --- a/include/linux/davinci_emac.h +++ b/include/linux/davinci_emac.h @@ -19,7 +19,6 @@ struct mdio_platform_data { }; struct emac_platform_data { - char mac_addr[ETH_ALEN]; u32 ctrl_reg_offset; u32 ctrl_mod_reg_offset; u32 ctrl_ram_offset; @@ -46,5 +45,4 @@ enum { EMAC_VERSION_2, /* DM646x */ }; -void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context); #endif