From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753392Ab3HVMnI (ORCPT ); Thu, 22 Aug 2013 08:43:08 -0400 Received: from 18.mo3.mail-out.ovh.net ([87.98.172.162]:43435 "EHLO mo3.mail-out.ovh.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753311Ab3HVMnG (ORCPT ); Thu, 22 Aug 2013 08:43:06 -0400 From: Boris BREZILLON To: "David S. Miller" , Mark Brown , Nick Bowler , Greg Kroah-Hartman , Grant Likely Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Boris BREZILLON X-Ovh-Mailout: 178.32.228.3 (mo3.mail-out.ovh.net) Subject: [RFC PATCH] phylib: mdio: handle register/unregister/register sequence Date: Thu, 22 Aug 2013 14:34:43 +0200 Message-Id: <1377174883-10643-1-git-send-email-b.brezillon@overkiz.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1377174836-10569-1-git-send-email-b.brezillon@overkiz.com> References: <1377174836-10569-1-git-send-email-b.brezillon@overkiz.com> X-Ovh-Tracer-Id: 388435468395575333 X-Ovh-Remote: 80.245.18.66 () X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeikedrgeefucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-Spam-Check: DONE|U 0.5/N X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeikedrgeefucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current implementation does not accept this sequence on a given mdio bus: register/unregister/register. The device core framework complain about already initialized kobject struct: "kobject (df9e9848): tried to init an initialized object, something is seriously wrong." This patch replaces the device_register call with device_add in mdiobus_register and move the device struct initialization in the mdiobus_alloc_size function. Thus the device struct is only initialized once. Signed-off-by: Boris BREZILLON --- drivers/net/phy/mdio_bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index dc92097..a256de3 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -68,6 +68,8 @@ struct mii_bus *mdiobus_alloc_size(size_t size) bus->priv = (void *)bus + aligned_size; } + device_initialize(&bus->dev); + return bus; } EXPORT_SYMBOL(mdiobus_alloc_size); @@ -151,7 +153,7 @@ int mdiobus_register(struct mii_bus *bus) bus->dev.groups = NULL; dev_set_name(&bus->dev, "%s", bus->id); - err = device_register(&bus->dev); + err = device_add(&bus->dev); if (err) { pr_err("mii_bus %s failed to register\n", bus->id); return -EINVAL; @@ -195,12 +197,12 @@ void mdiobus_unregister(struct mii_bus *bus) BUG_ON(bus->state != MDIOBUS_REGISTERED); bus->state = MDIOBUS_UNREGISTERED; - device_del(&bus->dev); for (i = 0; i < PHY_MAX_ADDR; i++) { if (bus->phy_map[i]) device_unregister(&bus->phy_map[i]->dev); bus->phy_map[i] = NULL; } + device_del(&bus->dev); } EXPORT_SYMBOL(mdiobus_unregister); -- 1.7.9.5