From patchwork Fri Jan 16 21:47:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 5650561 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B9F09F358 for ; Fri, 16 Jan 2015 21:47:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 577D320259 for ; Fri, 16 Jan 2015 21:47:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74A3D20254 for ; Fri, 16 Jan 2015 21:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409AbbAPVrU (ORCPT ); Fri, 16 Jan 2015 16:47:20 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:50357 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751314AbbAPVrU (ORCPT ); Fri, 16 Jan 2015 16:47:20 -0500 Received: by mail-wi0-f173.google.com with SMTP id r20so5223917wiv.0 for ; Fri, 16 Jan 2015 13:47:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=no8LEYaF3moHu1WISv/Dh/Z9Q3kYC3hTBNyJRvaG68U=; b=KRLbFfgUf8ATEP5/apzmTPA/CHgXafVUZfMtUguovMY+7CG2xpExAsqN1mrZ+XH8rL B0J/Jh32hwGoNcMFEpY7SV407kmf4rgBDuf6QHu4yuKH8Qk4jnLROxJFIW551GOzcMQr G2Mg/Qgq+OqY8SkK4NJdE8cPV9oFG7lvrcDaQNoGloqX+o5lNfMa/S5VLE7pyoiB7dNL Ks7GorppYZi7EDyklx+MboBRxK4K4JGHuHeOlTZENOq5BfrUKqrVMApcWtyEt/7knQ8m 1CRc5pWC4yMgRyhodScRqDbE3Ytmb5f0LywRjiqiMRLhwCx4EoBRhebqwFug8u6jWKhF y+jw== X-Received: by 10.180.84.134 with SMTP id z6mr10367631wiy.50.1421444839096; Fri, 16 Jan 2015 13:47:19 -0800 (PST) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id u3sm4511573wiw.24.2015.01.16.13.47.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jan 2015 13:47:18 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: linux-wireless@vger.kernel.org Cc: Hauke Mehrtens , "Saul St. John" , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH RFC] bcma: simplify freeing cores (internal devices structs) Date: Fri, 16 Jan 2015 22:47:08 +0100 Message-Id: <1421444828-32616-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Rafa? Mi?ecki --- This code was introduced by Saul in ee91592711ed90a1abfbb1b2ceadded11d685164 bcma: don't leak memory for PCIE, MIPS, GBIT cores I don't really see reason for making it in so complicated way. I tested my patch for crashes, but didn't really try kmemleak. Is my simple solution OK? Or am I missing something? Anyone? --- drivers/bcma/main.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index c3c5e0a..58dd582 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -371,6 +371,8 @@ static void bcma_unregister_cores(struct bcma_bus *bus) list_del(&core->list); if (core->dev_registered) device_unregister(&core->dev); + else + kfree(core); } if (bus->hosttype == BCMA_HOSTTYPE_SOC) platform_device_unregister(bus->drv_cc.watchdog); @@ -467,7 +469,6 @@ int bcma_bus_register(struct bcma_bus *bus) void bcma_bus_unregister(struct bcma_bus *bus) { - struct bcma_device *cores[3]; int err; err = bcma_gpio_unregister(&bus->drv_cc); @@ -478,15 +479,7 @@ void bcma_bus_unregister(struct bcma_bus *bus) bcma_core_chipcommon_b_free(&bus->drv_cc_b); - cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K); - cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE); - cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON); - bcma_unregister_cores(bus); - - kfree(cores[2]); - kfree(cores[1]); - kfree(cores[0]); } /*