From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Olof Johansson" <olof@lixom.net>,
"Arnd Bergmann" <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
"Richard Zhao" <richard.zhao@linaro.org>,
"Lothar Waßmann" <LW@KARO-electronics.de>
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 4 Jan 2012 15:06:58 +1100 [thread overview]
Message-ID: <20120104150658.aafd5ae8ebce944e897f1079@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/freescale/fec.c
index 112af9b,b0b0445..0000000
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
struct resource *r;
+ int i;
- fec_stop(ndev);
+ unregister_netdev(ndev);
fec_enet_mii_remove(fep);
+ for (i = 0; i < FEC_IRQ_NUM; i++) {
+ int irq = platform_get_irq(pdev, i);
+ if (irq > 0)
+ free_irq(irq, ndev);
+ }
- clk_disable(fep->clk);
+ clk_disable_unprepare(fep->clk);
clk_put(fep->clk);
iounmap(fep->hwp);
- unregister_netdev(ndev);
free_netdev(ndev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
"Olof Johansson" <olof@lixom.net>,
"Richard Zhao" <richard.zhao@linaro.org>,
linux-arm-kernel@lists.infradead.org,
"Lothar Waßmann" <LW@KARO-electronics.de>
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 4 Jan 2012 15:06:58 +1100 [thread overview]
Message-ID: <20120104150658.aafd5ae8ebce944e897f1079@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1284 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/freescale/fec.c
index 112af9b,b0b0445..0000000
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
struct resource *r;
+ int i;
- fec_stop(ndev);
+ unregister_netdev(ndev);
fec_enet_mii_remove(fep);
+ for (i = 0; i < FEC_IRQ_NUM; i++) {
+ int irq = platform_get_irq(pdev, i);
+ if (irq > 0)
+ free_irq(irq, ndev);
+ }
- clk_disable(fep->clk);
+ clk_disable_unprepare(fep->clk);
clk_put(fep->clk);
iounmap(fep->hwp);
- unregister_netdev(ndev);
free_netdev(ndev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: "Arnd Bergmann" <arnd@arndb.de>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
"Olof Johansson" <olof@lixom.net>,
"Richard Zhao" <richard.zhao@linaro.org>,
linux-arm-kernel@lists.infradead.org,
"Lothar Waßmann" <LW@KARO-electronics.de>
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 4 Jan 2012 15:06:58 +1100 [thread overview]
Message-ID: <20120104150658.aafd5ae8ebce944e897f1079@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1284 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/freescale/fec.c
index 112af9b,b0b0445..0000000
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
struct resource *r;
+ int i;
- fec_stop(ndev);
+ unregister_netdev(ndev);
fec_enet_mii_remove(fep);
+ for (i = 0; i < FEC_IRQ_NUM; i++) {
+ int irq = platform_get_irq(pdev, i);
+ if (irq > 0)
+ free_irq(irq, ndev);
+ }
- clk_disable(fep->clk);
+ clk_disable_unprepare(fep->clk);
clk_put(fep->clk);
iounmap(fep->hwp);
- unregister_netdev(ndev);
free_netdev(ndev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 4 Jan 2012 15:06:58 +1100 [thread overview]
Message-ID: <20120104150658.aafd5ae8ebce944e897f1079@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc drivers/net/ethernet/freescale/fec.c
index 112af9b,b0b0445..0000000
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
struct resource *r;
+ int i;
- fec_stop(ndev);
+ unregister_netdev(ndev);
fec_enet_mii_remove(fep);
+ for (i = 0; i < FEC_IRQ_NUM; i++) {
+ int irq = platform_get_irq(pdev, i);
+ if (irq > 0)
+ free_irq(irq, ndev);
+ }
- clk_disable(fep->clk);
+ clk_disable_unprepare(fep->clk);
clk_put(fep->clk);
iounmap(fep->hwp);
- unregister_netdev(ndev);
free_netdev(ndev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120104/5e7f6e25/attachment.sig>
next reply other threads:[~2012-01-04 4:07 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-04 4:06 Stephen Rothwell [this message]
2012-01-04 4:06 ` linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2012-01-04 4:06 ` Stephen Rothwell
2012-01-04 4:06 ` Stephen Rothwell
2012-01-04 4:46 ` Richard Zhao
2012-01-04 4:46 ` Richard Zhao
2014-03-31 2:24 Stephen Rothwell
2014-03-31 2:24 ` Stephen Rothwell
2014-03-31 2:24 ` Stephen Rothwell
2014-09-10 4:48 Stephen Rothwell
2014-09-10 4:48 ` Stephen Rothwell
2014-09-10 4:48 ` Stephen Rothwell
2014-09-10 8:06 ` Arnd Bergmann
2014-09-10 8:06 ` Arnd Bergmann
2014-09-25 2:58 Stephen Rothwell
2014-09-25 2:58 ` Stephen Rothwell
2014-09-25 2:58 ` Stephen Rothwell
2015-01-27 2:04 Stephen Rothwell
2015-01-27 2:04 ` Stephen Rothwell
2015-01-27 2:04 ` Stephen Rothwell
2016-05-10 0:18 Stephen Rothwell
2016-05-10 0:18 ` Stephen Rothwell
2016-05-10 0:18 ` Stephen Rothwell
2016-06-21 1:18 Stephen Rothwell
2016-06-21 1:18 ` Stephen Rothwell
2016-06-21 1:18 ` Stephen Rothwell
2016-06-21 1:18 ` Stephen Rothwell
2016-06-21 8:56 ` Arnd Bergmann
2016-06-21 8:56 ` Arnd Bergmann
2016-06-21 8:56 ` Arnd Bergmann
2016-07-27 2:53 Stephen Rothwell
2016-07-27 2:53 ` Stephen Rothwell
2016-07-27 2:53 ` Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-07-27 20:41 ` Duc Dang
2016-12-01 1:31 Stephen Rothwell
2016-12-01 1:31 ` Stephen Rothwell
2016-12-01 1:31 ` Stephen Rothwell
2019-09-05 3:42 Stephen Rothwell
2019-09-05 3:42 ` Stephen Rothwell
2021-02-16 2:04 Stephen Rothwell
2021-02-16 2:04 ` Stephen Rothwell
2021-02-16 2:20 ` nobuhiro1.iwamatsu
2021-02-16 2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11 ` Arnd Bergmann
2021-02-16 10:11 ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28 ` Naresh Kamboju
2021-02-16 12:28 ` Naresh Kamboju
2021-02-16 13:47 ` nobuhiro1.iwamatsu
2021-02-16 13:47 ` nobuhiro1.iwamatsu
2021-02-16 14:21 ` nobuhiro1.iwamatsu
2021-02-16 14:21 ` nobuhiro1.iwamatsu
2021-02-16 21:17 ` Stephen Rothwell
2021-02-16 21:17 ` Stephen Rothwell
2021-02-17 0:23 ` Yoshihiro Shimoda
2021-02-17 0:23 ` Yoshihiro Shimoda
2022-07-13 2:55 Stephen Rothwell
2022-07-13 2:55 ` Stephen Rothwell
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=20120104150658.aafd5ae8ebce944e897f1079@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=LW@KARO-electronics.de \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=richard.zhao@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.