Re: linux-next: manual merge of the net-next tree with the arm-soc tree

From: Richard Zhao <richard.zhao@freescale•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "David Miller" <davem@davemloft•net>,
	netdev@vger•kernel.org, "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: Re: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 4 Jan 2012 12:46:21 +0800	[thread overview]
Message-ID: <20120104044620.GL2414@b20223-02.ap.freescale.net> (raw)
In-Reply-To: <20120104150658.aafd5ae8ebce944e897f1079@canb.auug.org.au>

On Wed, Jan 04, 2012 at 03:06:58PM +1100, Stephen Rothwell wrote:
> 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.
It's good. 

Thanks
Richard
> -- 
> 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);


> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists•infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel