OSDN Git Service

phy: marvell: remove conflicting initializer
authorArnd Bergmann <arnd@arndb.de>
Mon, 23 Jan 2017 12:18:41 +0000 (13:18 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Jan 2017 19:08:46 +0000 (14:08 -0500)
commit187024144c6e0c82bc32ebb46f3cd0585264833e
tree5502b77ef973b39c41c1ccc646359bdb9b158ffc
parente1636836e0a080b71da1954f8604b1238e53d3b9
phy: marvell: remove conflicting initializer

One line was apparently pasted incorrectly during a new feature patch:

drivers/net/phy/marvell.c:2090:15: error: initialized field overwritten [-Werror=override-init]
   .features = PHY_GBIT_FEATURES,

I'm removing the extraneous line here to avoid the W=1 warning and restore
the previous flags value, and I'm slightly reordering the lines for consistency
to make it less likely to happen again in the future. The ordering in the
array is still not the same as in the structure definition, instead I picked
the order that is most common in this file and that seems to make more sense
here.

Fixes: 0b04680fdae4 ("phy: marvell: Add support for temperature sensor")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/marvell.c