From: David S. Miller Date: Wed, 29 Jul 2015 07:13:25 +0000 (-0700) Subject: Merge branch 'stmmac-cleanup' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3e24a65f9d2b9e2befacf5823e01ee158fdfedad;p=linux-beck.git Merge branch 'stmmac-cleanup' Joachim Eastwood says: ==================== stmmac clean up for 4.3 part2 This patch set creates proper probe functions in the remaining dwmac-* drivers, lets the drivers manage their own of match data structure, and cleans up some of the drivers a bit. Note that should be no functional change in any of the drivers. First patch from Fengguang fixes a Coccinelle that was found after the previous patch set when into next. Probe functions are best placed just above the platform_driver struct since it usually needs to call other functions in the driver but this requires some code movement in the drivers. To keep the conversion itself easier to review the code movement is done in separate patches. This creates some extra churn but I think it's worth it in this case. As only a couple of drivers actually needs to use of match data this pushed down from stmmac_platform and into the drivers. This also makes it possible for drivers to have their own match data structure. dwmac-rk benefits most from this. After each driver has it's own probe function and manages it's own match data the setup/free hooks and common match data struct are removed. Sorry for the slightly largish patch set this time around. Since I can only test the core changes on my platform and not the specific dwmac-drivers I greatly appreciate if people could test this on their respective platforms. I did spend quite a bit of time visually checking all these patches, but nothing beats real hardware testing. Thanks! Patch set based on net-next can also be picked up from here: https://github.com/manabian/linux-lpc.git stmmac_4.3_part2 For those who want to have a look at all the patches for v4.3 a branch based on Linus master can be found here: https://github.com/manabian/linux-lpc.git stmmac_4.2 Previous parts can be found here: http://www.spinics.net/lists/netdev/msg328997.html http://www.spinics.net/lists/netdev/msg329932.html http://www.spinics.net/lists/netdev/msg336097.html ==================== Signed-off-by: David S. Miller --- 3e24a65f9d2b9e2befacf5823e01ee158fdfedad