From: Greg Ungerer <gerg@snapgear.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: netdev@vger.kernel.org, Sebastian Siewior <bigeasy@linutronix.de>
Subject: Re: [PATCH] fec: remove empty functions
Date: Thu, 15 Jan 2009 13:54:24 +1000 [thread overview]
Message-ID: <496EB370.8010606@snapgear.com> (raw)
In-Reply-To: <1231949353-29630-3-git-send-email-s.hauer@pengutronix.de>
Hi Sascha,
Sascha Hauer wrote:
> There are some architecture specific functions which are all
> empty. Remove them.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
No problems with this one for ColdFire, so
Acked-by: Greg Ungerer <gerg@uclinux.org>
> ---
> drivers/net/fec.c | 65 -----------------------------------------------------
> 1 files changed, 0 insertions(+), 65 deletions(-)
>
> diff --git a/drivers/net/fec.c b/drivers/net/fec.c
> index 95785ef..812d8be 100644
> --- a/drivers/net/fec.c
> +++ b/drivers/net/fec.c
> @@ -1304,10 +1304,6 @@ static void __inline__ fec_get_mac(struct net_device *dev)
> dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
> }
>
> -static void __inline__ fec_enable_phy_intr(void)
> -{
> -}
> -
> static void __inline__ fec_disable_phy_intr(void)
> {
> volatile unsigned long *icrp;
> @@ -1323,17 +1319,6 @@ static void __inline__ fec_phy_ack_intr(void)
> *icrp = 0x0d000000;
> }
>
> -static void __inline__ fec_localhw_setup(void)
> -{
> -}
> -
> -/*
> - * Do not need to make region uncached on 5272.
> - */
> -static void __inline__ fec_uncache(unsigned long addr)
> -{
> -}
> -
> /* ------------------------------------------------------------------------- */
>
> #elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
> @@ -1473,10 +1458,6 @@ static void __inline__ fec_get_mac(struct net_device *dev)
> dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
> }
>
> -static void __inline__ fec_enable_phy_intr(void)
> -{
> -}
> -
> static void __inline__ fec_disable_phy_intr(void)
> {
> }
> @@ -1485,17 +1466,6 @@ static void __inline__ fec_phy_ack_intr(void)
> {
> }
>
> -static void __inline__ fec_localhw_setup(void)
> -{
> -}
> -
> -/*
> - * Do not need to make region uncached on 5272.
> - */
> -static void __inline__ fec_uncache(unsigned long addr)
> -{
> -}
> -
> /* ------------------------------------------------------------------------- */
>
> #elif defined(CONFIG_M520x)
> @@ -1594,10 +1564,6 @@ static void __inline__ fec_get_mac(struct net_device *dev)
> dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
> }
>
> -static void __inline__ fec_enable_phy_intr(void)
> -{
> -}
> -
> static void __inline__ fec_disable_phy_intr(void)
> {
> }
> @@ -1606,14 +1572,6 @@ static void __inline__ fec_phy_ack_intr(void)
> {
> }
>
> -static void __inline__ fec_localhw_setup(void)
> -{
> -}
> -
> -static void __inline__ fec_uncache(unsigned long addr)
> -{
> -}
> -
> /* ------------------------------------------------------------------------- */
>
> #elif defined(CONFIG_M532x)
> @@ -1733,10 +1691,6 @@ static void __inline__ fec_get_mac(struct net_device *dev)
> dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
> }
>
> -static void __inline__ fec_enable_phy_intr(void)
> -{
> -}
> -
> static void __inline__ fec_disable_phy_intr(void)
> {
> }
> @@ -1745,17 +1699,6 @@ static void __inline__ fec_phy_ack_intr(void)
> {
> }
>
> -static void __inline__ fec_localhw_setup(void)
> -{
> -}
> -
> -/*
> - * Do not need to make region uncached on 532x.
> - */
> -static void __inline__ fec_uncache(unsigned long addr)
> -{
> -}
> -
> #endif
>
> /* ------------------------------------------------------------------------- */
> @@ -2197,8 +2140,6 @@ int __init fec_enet_init(struct net_device *dev)
> cbd_base = (cbd_t *)mem_addr;
> /* XXX: missing check for allocation failure */
>
> - fec_uncache(mem_addr);
> -
> /* Set receive and transmit descriptor base.
> */
> fep->rx_bd_base = cbd_base;
> @@ -2219,8 +2160,6 @@ int __init fec_enet_init(struct net_device *dev)
> mem_addr = __get_free_page(GFP_KERNEL);
> /* XXX: missing check for allocation failure */
>
> - fec_uncache(mem_addr);
> -
> /* Initialize the BD for every fragment in the page.
> */
> for (j=0; j<FEC_ENET_RX_FRPPG; j++) {
> @@ -2336,7 +2275,6 @@ fec_restart(struct net_device *dev, int duplex)
> /* Clear any outstanding interrupt.
> */
> fecp->fec_ievent = 0xffc00000;
> - fec_enable_phy_intr();
>
> /* Set station address.
> */
> @@ -2351,8 +2289,6 @@ fec_restart(struct net_device *dev, int duplex)
> */
> fecp->fec_r_buff_size = PKT_MAXBLR_SIZE;
>
> - fec_localhw_setup();
> -
> /* Set receive and transmit descriptor base.
> */
> fecp->fec_r_des_start = __pa((uint)(fep->rx_bd_base));
> @@ -2458,7 +2394,6 @@ fec_stop(struct net_device *dev)
> /* Clear outstanding MII command interrupts.
> */
> fecp->fec_ievent = FEC_ENET_MII;
> - fec_enable_phy_intr();
>
> fecp->fec_imask = FEC_ENET_MII;
> fecp->fec_mii_speed = fep->phy_speed;
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear, a McAfee Company PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
next prev parent reply other threads:[~2009-01-15 3:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-14 16:09 [RFC] FEC patches Sascha Hauer
2009-01-14 16:09 ` [PATCH] fec: remove unused #else branches Sascha Hauer
2009-01-14 16:09 ` [PATCH] fec: remove empty functions Sascha Hauer
2009-01-14 16:09 ` [PATCH] fec: use linux/*.h instead of asm/*.h Sascha Hauer
2009-01-14 16:09 ` [PATCH] fec: do not use memcpy on physical addresses Sascha Hauer
2009-01-14 16:09 ` [PATCH] fec: use dma_alloc_coherent for descriptor ring Sascha Hauer
2009-01-14 16:09 ` [PATCH] fec: Add mx2 support (WIP) Sascha Hauer
2009-01-15 7:22 ` Greg Ungerer
2009-01-15 10:15 ` Sascha Hauer
2009-01-15 5:20 ` [PATCH] fec: use dma_alloc_coherent for descriptor ring Greg Ungerer
2009-01-15 3:55 ` [PATCH] fec: do not use memcpy on physical addresses Greg Ungerer
2009-01-15 3:55 ` [PATCH] fec: use linux/*.h instead of asm/*.h Greg Ungerer
2009-01-15 3:54 ` Greg Ungerer [this message]
2009-01-15 3:43 ` [PATCH] fec: remove unused #else branches Greg Ungerer
2009-01-15 10:17 ` Sascha Hauer
2009-01-15 4:06 ` [RFC] FEC patches Greg Ungerer
2009-01-15 10:24 ` Sascha Hauer
2009-01-16 0:10 ` Greg Ungerer
[not found] <1233051848-5994-1-git-send-email-y>
[not found] ` <1233051848-5994-2-git-send-email-y>
2009-01-27 10:24 ` [PATCH] fec: remove empty functions y
-- strict thread matches above, loose matches on Subject: below --
2009-01-27 10:39 FEC Patches Sascha Hauer
2009-01-27 10:39 ` [PATCH] fec: remove unused #else branches Sascha Hauer
2009-01-27 10:39 ` [PATCH] fec: remove empty functions Sascha Hauer
2009-01-29 9:03 FEC patches Sascha Hauer
2009-01-29 9:03 ` [PATCH] fec: remove unused #else branches Sascha Hauer
2009-01-29 9:03 ` [PATCH] fec: remove empty functions Sascha Hauer
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=496EB370.8010606@snapgear.com \
--to=gerg@snapgear.com \
--cc=bigeasy@linutronix.de \
--cc=netdev@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).