net/macb: merge at91_ether driver into macb driver
authorCyrille Pitchen <cyrille.pitchen@atmel.com>
Sat, 7 Mar 2015 06:23:32 +0000 (07:23 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 8 Mar 2015 03:31:37 +0000 (22:31 -0500)
commit421d9df0628be16e55705573ab49d8ddb6a1d68c
tree4e7799984044b96d12ddbda9ae07d9412f365369
parent93b31f48b3ba84cc5fc310c9765d11ebbeede7b5
net/macb: merge at91_ether driver into macb driver

macb and at91_ether drivers can be compiled as modules, but the at91_ether
driver use some functions and variables defined in the macb one, thus
creating a dependency on the macb driver.

Since these drivers are sharing the same logic we can easily merge
at91_ether into macb.

In order to factorize common probing logic we've added an ->init() function
to struct macb_config (the structure associated with the compatible
string), and moved macb specific init code from macb_probe to macb_init.

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/Kconfig
drivers/net/ethernet/cadence/Makefile
drivers/net/ethernet/cadence/at91_ether.c [deleted file]
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/cadence/macb.h