From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751204AbdAWMTa (ORCPT ); Mon, 23 Jan 2017 07:19:30 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:62894 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751016AbdAWMT2 (ORCPT ); Mon, 23 Jan 2017 07:19:28 -0500 From: Arnd Bergmann To: Florian Fainelli Cc: Arnd Bergmann , "David S. Miller" , Andrew Lunn , Charles-Antoine Couret , Clemens Gruber , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] phy: marvell: remove conflicting initializer Date: Mon, 23 Jan 2017 13:18:41 +0100 Message-Id: <20170123121905.3245589-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:n2V6rWUXE2GNTDPBLKIRqOFciErdqZbnDXBFdjinW4gCBez/WOx 1Wg7a6jvHI2HDydriRMNbD5wfdXcl13TMONTDvjjcRhrH9+ZH0PNyUjGto7opkqsx02ZLZ/ 6WDLd+nQ7v6f2XKZIwMuzA8LGjA+BxN4qt4SyqMLR/tjMou15eFmbNawIrtUmDGL7PtQCoP iEEzi9A6YsOJcxoKNtcdA== X-UI-Out-Filterresults: notjunk:1;V01:K0:zTliLTNAIkA=:co6rsh3qssFmW0Ra6/wITQ DksR05GH7YO25prpNehZw3VNtU5jFE4MJADuGt6xZwHkKmwvM0uORtyfG9kNJRLCUYcoN2ivU 2GTtxbNFyx6YXxbStCs5zFeBeJz9vd3ODpOR7nTOAVBnDWU6ojY9IyqBlN1uUy4XDMVloUOnk Qm3Oey9BDO/Or6VI2GZ3h7AAjDLDmclyt2qhc7Z81KUNsdrY/BbahiV341sedaNShjUQ4VOKq Q1KhuUt6Oej5Nx7YYgT5tqYiaqHgBTLY38sEOXY7IVlhj4N2FEAd3MIa8lG2sDphXvreGPY+b nL2mmVteO6PiX+VXKMOxOH33EkFZ3GGQ7uK9fKv5/68xvqiQ5eOz6zYZG42MK/uq0ma0b3Ogs Fcwu6RtY0HVrI5EG06sNoYrxZYD9hAr1T0NjEDqPndJ3+/K263gNqSwfkusR5F9qfkdFL5Zza 0ZocO1IX6WH4tefyCyVVmt6UgtRYDX3XEYv1uwQidSHlSSEF8Gvfdu7aMTt4t6qa/jFWZzP8Z u8Fp4hYpM5wVLRjODyai8vEvzzy0pEz3bdnLjlp39lo6Xb/PBecdi98Qy2kBCK765CekAkOtE /pwj7EvCBpo/YbLLvUc9lZvAHPAuj6erRIKF+bjc/0bXQlGOdQroPEc99tzETIjKswETdrKcO aa7iZb6/g8cZPSrIQ1IIulaw6EcfpMkd1k1yUsThcl0Zi4WWMZ5vuk0xSbyekc9kkQyQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/phy/marvell.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 64229976ace1..b5b73ff4329a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1900,8 +1900,8 @@ static struct phy_driver marvell_drivers[] = { .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1101", .features = PHY_GBIT_FEATURES, - .probe = marvell_probe, .flags = PHY_HAS_INTERRUPT, + .probe = marvell_probe, .config_init = &marvell_config_init, .config_aneg = &marvell_config_aneg, .read_status = &genphy_read_status, @@ -1971,10 +1971,10 @@ static struct phy_driver marvell_drivers[] = { .phy_id = MARVELL_PHY_ID_88E1121R, .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1121R", - .probe = &m88e1121_probe, - .remove = &marvell_remove, .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, + .probe = &m88e1121_probe, + .remove = &marvell_remove, .config_init = &m88e1121_config_init, .config_aneg = &m88e1121_config_aneg, .read_status = &marvell_read_status, @@ -2085,10 +2085,9 @@ static struct phy_driver marvell_drivers[] = { .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1510", .features = PHY_GBIT_FEATURES | SUPPORTED_FIBRE, + .flags = PHY_HAS_INTERRUPT, .probe = &m88e1510_probe, .remove = &marvell_remove, - .features = PHY_GBIT_FEATURES, - .flags = PHY_HAS_INTERRUPT, .config_init = &m88e1510_config_init, .config_aneg = &m88e1510_config_aneg, .read_status = &marvell_read_status, @@ -2105,10 +2104,10 @@ static struct phy_driver marvell_drivers[] = { .phy_id = MARVELL_PHY_ID_88E1540, .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1540", - .probe = m88e1510_probe, - .remove = &marvell_remove, .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, + .probe = m88e1510_probe, + .remove = &marvell_remove, .config_init = &marvell_config_init, .config_aneg = &m88e1510_config_aneg, .read_status = &marvell_read_status, -- 2.9.0