* [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable)
@ 2013-08-22 19:55 Anatolij Gustschin
2013-08-22 19:55 ` [PATCH net-next 2/2] fs_enet: cleanup clock API use Anatolij Gustschin
2013-08-23 5:14 ` [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable) David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Anatolij Gustschin @ 2013-08-22 19:55 UTC (permalink / raw)
To: netdev; +Cc: davem, pantelis.antoniou, vbordug, Gerhard Sittig
From: Gerhard Sittig <gsi@denx.de>
Since commit 720a43efd30f04a0a492c85fb997361c44fbae05
(drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb)
there is a build warning:
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c: In function 'tx_skb_align_workaround':
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c:586:26: warning: unused variable 'fep'
Fix it.
Signed-off-by: Gerhard Sittig <gsi@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 8de53a1..c04eb3a 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -583,7 +583,6 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
struct sk_buff *skb)
{
struct sk_buff *new_skb;
- struct fs_enet_private *fep = netdev_priv(dev);
/* Alloc new skb */
new_skb = netdev_alloc_skb(dev, skb->len + 4);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] fs_enet: cleanup clock API use
2013-08-22 19:55 [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable) Anatolij Gustschin
@ 2013-08-22 19:55 ` Anatolij Gustschin
2013-08-23 5:14 ` David Miller
2013-08-23 5:14 ` [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable) David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Anatolij Gustschin @ 2013-08-22 19:55 UTC (permalink / raw)
To: netdev; +Cc: davem, pantelis.antoniou, vbordug, Gerhard Sittig
From: Gerhard Sittig <gsi@denx.de>
make the Freescale ethernet driver get, prepare and enable the FEC clock
during probe(); disable and unprepare the clock upon remove(), put is
done by the devm approach; hold a reference to the clock over the period
of use.
clock lookup is non-fatal as not all platforms provide clock specs in
their device tree; failure to enable specified clocks is fatal.
Signed-off-by: Gerhard Sittig <gsi@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 20 ++++++++++++++++++++
include/linux/fs_enet_pd.h | 3 +++
2 files changed, 23 insertions(+)
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index c04eb3a..6b60582 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -999,6 +999,8 @@ static int fs_enet_probe(struct platform_device *ofdev)
struct fs_enet_private *fep;
struct fs_platform_info *fpi;
const u32 *data;
+ struct clk *clk;
+ int err;
const u8 *mac_addr;
const char *phy_connection_type;
int privsize, len, ret = -ENODEV;
@@ -1036,6 +1038,20 @@ static int fs_enet_probe(struct platform_device *ofdev)
fpi->use_rmii = 1;
}
+ /* make clock lookup non-fatal (the driver is shared among platforms),
+ * but require enable to succeed when a clock was specified/found,
+ * keep a reference to the clock upon successful acquisition
+ */
+ clk = devm_clk_get(&ofdev->dev, "per");
+ if (!IS_ERR(clk)) {
+ err = clk_prepare_enable(clk);
+ if (err) {
+ ret = err;
+ goto out_free_fpi;
+ }
+ fpi->clk_per = clk;
+ }
+
privsize = sizeof(*fep) +
sizeof(struct sk_buff **) *
(fpi->rx_ring + fpi->tx_ring);
@@ -1107,6 +1123,8 @@ out_free_dev:
free_netdev(ndev);
out_put:
of_node_put(fpi->phy_node);
+ if (fpi->clk_per)
+ clk_disable_unprepare(fpi->clk_per);
out_free_fpi:
kfree(fpi);
return ret;
@@ -1123,6 +1141,8 @@ static int fs_enet_remove(struct platform_device *ofdev)
fep->ops->cleanup_data(ndev);
dev_set_drvdata(fep->dev, NULL);
of_node_put(fep->fpi->phy_node);
+ if (fep->fpi->clk_per)
+ clk_disable_unprepare(fep->fpi->clk_per);
free_netdev(ndev);
return 0;
}
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 343d82a..efb0596 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -16,6 +16,7 @@
#ifndef FS_ENET_PD_H
#define FS_ENET_PD_H
+#include <linux/clk.h>
#include <linux/string.h>
#include <linux/of_mdio.h>
#include <linux/if_ether.h>
@@ -143,6 +144,8 @@ struct fs_platform_info {
int use_rmii; /* use RMII mode */
int has_phy; /* if the network is phy container as well...*/
+
+ struct clk *clk_per; /* 'per' clock for register access */
};
struct fs_mii_fec_platform_info {
u32 irq[32];
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable)
2013-08-22 19:55 [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable) Anatolij Gustschin
2013-08-22 19:55 ` [PATCH net-next 2/2] fs_enet: cleanup clock API use Anatolij Gustschin
@ 2013-08-23 5:14 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-08-23 5:14 UTC (permalink / raw)
To: agust; +Cc: netdev, pantelis.antoniou, vbordug, gsi
From: Anatolij Gustschin <agust@denx.de>
Date: Thu, 22 Aug 2013 21:55:12 +0200
> From: Gerhard Sittig <gsi@denx.de>
>
> Since commit 720a43efd30f04a0a492c85fb997361c44fbae05
> (drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb)
> there is a build warning:
>
> drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c: In function 'tx_skb_align_workaround':
> drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c:586:26: warning: unused variable 'fep'
>
> Fix it.
>
> Signed-off-by: Gerhard Sittig <gsi@denx.de>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 2/2] fs_enet: cleanup clock API use
2013-08-22 19:55 ` [PATCH net-next 2/2] fs_enet: cleanup clock API use Anatolij Gustschin
@ 2013-08-23 5:14 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-08-23 5:14 UTC (permalink / raw)
To: agust; +Cc: netdev, pantelis.antoniou, vbordug, gsi
From: Anatolij Gustschin <agust@denx.de>
Date: Thu, 22 Aug 2013 21:55:13 +0200
> From: Gerhard Sittig <gsi@denx.de>
>
> make the Freescale ethernet driver get, prepare and enable the FEC clock
> during probe(); disable and unprepare the clock upon remove(), put is
> done by the devm approach; hold a reference to the clock over the period
> of use.
>
> clock lookup is non-fatal as not all platforms provide clock specs in
> their device tree; failure to enable specified clocks is fatal.
>
> Signed-off-by: Gerhard Sittig <gsi@denx.de>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-23 5:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-22 19:55 [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable) Anatolij Gustschin
2013-08-22 19:55 ` [PATCH net-next 2/2] fs_enet: cleanup clock API use Anatolij Gustschin
2013-08-23 5:14 ` David Miller
2013-08-23 5:14 ` [PATCH net-next 1/2] fs_enet: silence a build warning (unused variable) David Miller
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).