From: Fabio Estevam <fabio.estevam@freescale.com>
To: <davem@davemloft.net>
Cc: <shawn.guo@linaro.org>, <netdev@vger.kernel.org>,
<kernel@pengutronix.de>,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: [PATCH 2/2] fec: Remove <linux/fec.h> header file
Date: Tue, 21 May 2013 12:44:27 -0300 [thread overview]
Message-ID: <1369151067-5220-2-git-send-email-fabio.estevam@freescale.com> (raw)
In-Reply-To: <1369151067-5220-1-git-send-email-fabio.estevam@freescale.com>
There is no need to have a header file to hold a single structure.
Move the 'fec_platform_data' structure definition into the local "fec.h" file
and get rid of <linux/fec.h> header.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/net/ethernet/freescale/fec.h | 6 ++++++
drivers/net/ethernet/freescale/fec_main.c | 1 -
drivers/net/ethernet/freescale/fec_ptp.c | 1 -
include/linux/fec.h | 24 ------------------------
4 files changed, 6 insertions(+), 26 deletions(-)
delete mode 100644 include/linux/fec.h
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 9ce5b71..d036303 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -16,6 +16,7 @@
#include <linux/clocksource.h>
#include <linux/net_tstamp.h>
#include <linux/ptp_clock_kernel.h>
+#include <linux/phy.h>
#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
defined(CONFIG_M520x) || defined(CONFIG_M532x) || \
@@ -274,6 +275,11 @@ struct fec_enet_private {
struct fec_enet_delayed_work delay_work;
};
+struct fec_platform_data {
+ phy_interface_t phy;
+ unsigned char mac[ETH_ALEN];
+};
+
void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev);
void fec_ptp_start_cyclecounter(struct net_device *ndev);
int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd);
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 706e224..148bcd2 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -48,7 +48,6 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/phy.h>
-#include <linux/fec.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 25fc960..24ee926 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -41,7 +41,6 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/phy.h>
-#include <linux/fec.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
diff --git a/include/linux/fec.h b/include/linux/fec.h
deleted file mode 100644
index bcff455..0000000
--- a/include/linux/fec.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* include/linux/fec.h
- *
- * Copyright (c) 2009 Orex Computed Radiography
- * Baruch Siach <baruch@tkos.co.il>
- *
- * Copyright (C) 2010 Freescale Semiconductor, Inc.
- *
- * Header file for the FEC platform data
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __LINUX_FEC_H__
-#define __LINUX_FEC_H__
-
-#include <linux/phy.h>
-
-struct fec_platform_data {
- phy_interface_t phy;
- unsigned char mac[ETH_ALEN];
-};
-
-#endif
--
1.8.1.2
next prev parent reply other threads:[~2013-05-21 15:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-21 15:44 [PATCH 1/2] fec: Use DIV_ROUND_UP macro Fabio Estevam
2013-05-21 15:44 ` Fabio Estevam [this message]
2013-05-21 16:02 ` [PATCH 2/2] fec: Remove <linux/fec.h> header file Fabio Estevam
2013-05-23 7:06 ` David Miller
2013-05-23 7:05 ` [PATCH 1/2] fec: Use DIV_ROUND_UP macro David Miller
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=1369151067-5220-2-git-send-email-fabio.estevam@freescale.com \
--to=fabio.estevam@freescale.com \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=shawn.guo@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 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).