Merge branch 'r8169-improve-handling-of-chip-specific-configuration'

Heiner Kallweit says:

====================
r8169: improve handling of chip-specific configuration

This series improves and simplifies handling of chip-specific
configuration.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>