From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Grygorii Strashko <grygorii.strashko@ti.com>,
"David S . Miller" <davem@davemloft.net>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Lukas Wunner <lukas@wunner.de>, Rob Herring <robh@kernel.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>,
David Lechner <david@lechnology.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Lunn <andrew@lunn.ch>, Jonathan Corbet <corbet@lwn.net>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
netdev@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v3 18/18] ARM: davinci: remove dead code related to MAC address reading
Date: Thu, 28 Jun 2018 16:32:44 +0200 [thread overview]
Message-ID: <20180628143244.4561-19-brgl@bgdev.pl> (raw)
In-Reply-To: <20180628143244.4561-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
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 <bgolaszewski@baylibre.com>
---
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
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: brgl@bgdev.pl (Bartosz Golaszewski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 18/18] ARM: davinci: remove dead code related to MAC address reading
Date: Thu, 28 Jun 2018 16:32:44 +0200 [thread overview]
Message-ID: <20180628143244.4561-19-brgl@bgdev.pl> (raw)
In-Reply-To: <20180628143244.4561-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
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 <bgolaszewski@baylibre.com>
---
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
--
2.17.1
next prev parent reply other threads:[~2018-06-28 14:32 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 14:32 [PATCH v3 00/18] ARM: davinci: step towards removing at24_platform_data Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 01/18] nvmem: add support for cell lookups Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 02/18] Documentation: nvmem: document lookup entries Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 03/18] ARM: davinci: dm365-evm: use nvmem lookup for mac address Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 04/18] ARM: davinci: dm644-evm: " Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 05/18] ARM: davinci: dm646x-evm: " Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 06/18] ARM: davinci: da830-evm: " Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 07/18] ARM: davinci: mityomapl138: add nvmem cells lookup entries Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 08/18] net: davinci_emac: potentially get the MAC address from MTD Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 09/18] ARM: davinci: da850-evm: remove dead MTD code Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 10/18] net: davinci_emac: use nvmem to retrieve the mac address Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 11/18] ARM: davinci: mityomapl138: don't read the MAC address from machine code Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 12/18] ARM: davinci: dm365-evm: use device properties for at24 eeprom Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 13/18] ARM: davinci: da830-evm: " Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 14/18] ARM: davinci: dm644x-evm: " Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 15/18] ARM: davinci: dm646x-evm: " Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 16/18] ARM: davinci: sffsdr: fix the at24 eeprom device name Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` [PATCH v3 17/18] ARM: davinci: sffsdr: use device properties for at24 eeprom Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski
2018-06-28 14:32 ` Bartosz Golaszewski [this message]
2018-06-28 14:32 ` [PATCH v3 18/18] ARM: davinci: remove dead code related to MAC address reading Bartosz Golaszewski
2018-06-29 9:42 ` [PATCH v3 00/18] ARM: davinci: step towards removing at24_platform_data Bartosz Golaszewski
2018-06-29 9:42 ` Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180628143244.4561-19-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andrew@lunn.ch \
--cc=bgolaszewski@baylibre.com \
--cc=corbet@lwn.net \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=david@lechnology.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=grygorii.strashko@ti.com \
--cc=ivan.khoronzhuk@linaro.org \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=robh@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.