From patchwork Thu Feb 2 21:33:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9553257 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 654E860405 for ; Thu, 2 Feb 2017 21:33:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 598F328499 for ; Thu, 2 Feb 2017 21:33:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E7B0284BC; Thu, 2 Feb 2017 21:33:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 049BA28499 for ; Thu, 2 Feb 2017 21:33:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751911AbdBBVdr (ORCPT ); Thu, 2 Feb 2017 16:33:47 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35584 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbdBBVdn (ORCPT ); Thu, 2 Feb 2017 16:33:43 -0500 Received: by mail-lf0-f66.google.com with SMTP id v186so42608lfa.2 for ; Thu, 02 Feb 2017 13:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EbAkZCggqMweNSu8r2oLVvZwfgqhnwehd+/M9C4VeM0=; b=H3Vt7TOiRSOkhCE19s6fxBdBn7PsdWHKvor/v9g+WZlDPV4p5VoYJd81w0l1PuV+Z3 6seAqPMk/s5MjCApGmw1fZpfBXGgPE8gTOl4zWY5OukPxd+xsP5gxl3SOBY424XEATLW Nj2cpd0AauyXoBncTVZxG7Ibu4Pr0gLgNvYmPglt8M/y0i6riB/5kUgwXHRjt3WBwjfH I88asH7xCOqc/L6PWzQOyLA8Vbu1kh4hXj4JUR/iyRl6RurLWYUwsBoUoiQlK4cY1UiZ tDT8KNu+dXlGC6F/oHcttoYnWgi9jJiKGLq5zVsU2++dqRP0TD7LpX9FoEqDjkhFdCxJ ClBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EbAkZCggqMweNSu8r2oLVvZwfgqhnwehd+/M9C4VeM0=; b=U2EmA1MnENx61p5JLC59Gpj8v0JwTla7cJ5zYdJVerGkwvUpzMiQrnQx1MVNBDhhoA UsEWZ6KBaSNuDKNMxw5yaj2y/nJQM26OYCJayPYv88K+uzayVw8ahs28zLUF5N8xi5C+ L+ag8qNEhClixp9+ukepYi3Vdr2ewXKm8f7jG2QD6T8hyixk4qZD8EgLkf+qoGKT045v N9f0rJGDUMFJJGdoKHZiuFhBL/7KjtPq1txOnNh6l1aC8B+eoRqWEeaUu9YUJAxNQtjZ HJNT7LPiWAFIClChjv/MQHdjoaeYb4ufQERNZjQuZNb/sWq0QLB6pvnraectGDAo+SVI fH9w== X-Gm-Message-State: AIkVDXJhVJrSmMntPufYKksaupDPkv4cShMWV61T45xF4M78sksaSQ+/oRskl8nTGSGGuA== X-Received: by 10.25.203.6 with SMTP id b6mr3158504lfg.145.1486071222244; Thu, 02 Feb 2017 13:33:42 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id 1sm2590003ljv.40.2017.02.02.13.33.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Feb 2017 13:33:41 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V3 5/9] brcmfmac: pcie: store private pointer to struct brcmf_pub Date: Thu, 2 Feb 2017 22:33:17 +0100 Message-Id: <20170202213321.11591-5-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170202213321.11591-1-zajec5@gmail.com> References: <20170202213321.11591-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafał Miłecki Getting this pointer in PCIe code is not trivial and requires using dev_get_drvdata helper which adds extra line of code. Having access to this struct is useful for using generic stuff and e.g. improving logging messages. Signed-off-by: Rafał Miłecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 6fae4cf3f6ab..8a3c6e2e4b38 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -265,6 +265,7 @@ struct brcmf_pciedev_info { void (*write_ptr)(struct brcmf_pciedev_info *devinfo, u32 mem_offset, u16 value); struct brcmf_mp_device *settings; + struct brcmf_pub *pub; }; struct brcmf_pcie_ringbuf { @@ -1564,14 +1565,18 @@ static void brcmf_pcie_release_resource(struct brcmf_pciedev_info *devinfo) static int brcmf_pcie_attach_bus(struct brcmf_pciedev_info *devinfo) { + struct device *dev = &devinfo->pdev->dev; + struct brcmf_bus *bus = dev_get_drvdata(dev); int ret; /* Attach to the common driver interface */ - ret = brcmf_attach(&devinfo->pdev->dev, devinfo->settings); + ret = brcmf_attach(dev, devinfo->settings); if (ret) { brcmf_err("brcmf_attach failed\n"); } else { - ret = brcmf_bus_started(&devinfo->pdev->dev); + devinfo->pub = bus->drvr; + + ret = brcmf_bus_started(dev); if (ret) brcmf_err("dongle is not responding\n"); }