From: David S. Miller Date: Tue, 3 May 2016 19:22:21 +0000 (-0400) Subject: Merge branch 'stmmac-dwmac-socfpga-cleanup' X-Git-Tag: v4.7-rc1~154^2~137 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da7daf5b76a0e067887567267ba020599e9c13b2;p=karo-tx-linux.git Merge branch 'stmmac-dwmac-socfpga-cleanup' Joachim Eastwood says: ==================== stmmac: dwmac-socfpga refactor+cleanup This patch aims to remove the init/exit callbacks from the dwmac- socfpga driver and instead use standard PM callbacks. Doing this will also allow us to cleanup the driver. Eventually the init/exit callbacks will be deprecated and removed from all drivers dwmac-* except for dwmac-generic. Drivers will be refactored to use standard PM and remove callbacks. This patch set should not change the behavior of the driver itself, it only moves code around. The only exception to this is patch number 4 which restores the resume callback behavior which was changed in the "net: stmmac: socfpga: Remove re-registration of reset controller" patch. I belive calling phy_resume() only from the resume callback and not probe is the right thing to do. Changes from v1: - Rebase on net-next One heads-up here: The first patch changes the prototype of a couple of functions used in Alexandre's "add Ethernet glue logic for stm32 chip" patch [1] and will cause build failures for dwmac-stm32.c if not fixed up! If Alexandre's patch set is applied first I will gladly rebase my patch set to account for his driver as well. [1] https://patchwork.ozlabs.org/patch/614405/ ==================== Signed-off-by: David S. Miller --- da7daf5b76a0e067887567267ba020599e9c13b2