From patchwork Fri Jun 29 09:40:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10496013 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 819F46022E for ; Fri, 29 Jun 2018 09:45:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66C70299A3 for ; Fri, 29 Jun 2018 09:45:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A81F299A9; Fri, 29 Jun 2018 09:45:30 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0BE3F299A3 for ; Fri, 29 Jun 2018 09:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=UHgWEcMA+YuzfNrpUPTDtEmmRG+KHuBEH0kUjy9fDEc=; b=gj0++1aKAqZcbOFLLrHKrZcKry 9/Z36MDzTMLx6RzFkT83H93wnGVQNpAO6dSWTeBFatXoFpM8rx16yNN81h5oOkShs+u2delGxBO/W ZpxdfAv4pv5Z6vJ4bAv2UUr4fXaJ8dxd5mu7jws37BbEaUlfxDOplSEVvmxpuWSuOyCrvkyqxfZZu L0Qc9CIYRqiBfU7UMpYALHCMR036FBTjEHbQ5fzSgnA1CrvNk86F9X+LiMMW1rGJNOBTy9oT0IpXq +sVwOAq6ovDKb4WxRSfUapq3RrinfdzGqPtWLg5/p2t1x0kY5PpFDSiKl5DgJ+1/CJNf+KMl8gKV2 9alBhPEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYpxz-0003tk-W5; Fri, 29 Jun 2018 09:45:24 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYpu2-0000p9-QI for linux-arm-kernel@lists.infradead.org; Fri, 29 Jun 2018 09:41:34 +0000 Received: by mail-wr0-x241.google.com with SMTP id k7-v6so4707653wrq.0 for ; Fri, 29 Jun 2018 02:41:09 -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=sVL77/ZJD73ZOrNYBNMI4Oy1fKUIyNDghcLEo2AE6NuvERvWvitrJKco+6zEw1rrjx BYEvGlq5j+jNb4FqItkxskFIV63fvFPCbw0w5sLqjXt1E4voL7eI93rUSlZbzEjE/+m7 TO/6L4EqTn2399keKOSyRX7WJhqWJU9X24vMRRC/umLMmjIjkqe3Fi5+15NXvznkTTWS t1CDJiU8dRhm07bCQWLxF+soEWSfMkeYj8sudkp7Uy4Sn7Aos0nnuezJmvrL5UHGTfI/ ZgxhtGLkD674XLfbbNcN2iLNN/OSBtxt5HE7DdRc4IWZU5hYatn8KvGhU6zbj2eUCvSw Km4w== 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=FNwpjpRXl9WTKq6MW29nzLojn6DYDm0vnGdAjjWEtsTLFYSQ35KE1X+oCJS4K4+VlH VgygUttKhBvG1ewk9hZyxFp55v+Bxicjqa219ofDymc4Zr4UQLYkwLtw9eCJXkdJRKHg FERZeWW7DhBIH5fMiJGD6IadoIa63JCStSvKhcCHQxYOGlyCQNceQZuBGHHYFXrStf3H C6mLkIDkANTQVz4qMtHohZr4KCeN0B96cfycIdVf8yDVJFojXBBodcebiB86e1U0SPCE AkNClGmspb4T/2RVjjDJMHRkms4J7N4Bqo2f1wWH+bqM2GmLqkDhoebJMN3Tv+D2qX0r /gRA== X-Gm-Message-State: APt69E2QB28LlbRhKaWmrAk1uDZji1hfJ0Oz4mvzYhQ8pTqbLWWK3/fe PaFxcEmUTksOmgfy9MDY/3TBPw== X-Google-Smtp-Source: AAOMgpdkYVIyRqQ9aENw5f8/jv/gl0RAPguEbmMrryxydRcGzIMIcpsKLbjKkwkENu9JBL7gQf/psQ== X-Received: by 2002:adf:f6c4:: with SMTP id y4-v6mr11216416wrp.4.1530265268615; Fri, 29 Jun 2018 02:41:08 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-NIC-1-55-10.w2-15.abo.wanadoo.fr. [2.15.147.10]) by smtp.gmail.com with ESMTPSA id d102-v6sm1386394wma.10.2018.06.29.02.41.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jun 2018 02:41:07 -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 Subject: [PATCH v4 18/18] ARM: davinci: remove dead code related to MAC address reading Date: Fri, 29 Jun 2018 11:40:39 +0200 Message-Id: <20180629094039.7543-19-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629094039.7543-1-brgl@bgdev.pl> References: <20180629094039.7543-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180629_024119_470537_7054A17E X-CRM114-Status: GOOD ( 13.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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