From patchwork Sat Oct 17 10:32:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 7421961 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 712D2BEEA4 for ; Sat, 17 Oct 2015 10:33:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 917E920615 for ; Sat, 17 Oct 2015 10:33:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 545DD20614 for ; Sat, 17 Oct 2015 10:33:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbbJQKd0 (ORCPT ); Sat, 17 Oct 2015 06:33:26 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:34468 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbbJQKdZ (ORCPT ); Sat, 17 Oct 2015 06:33:25 -0400 Received: by wicgb1 with SMTP id gb1so38241023wic.1 for ; Sat, 17 Oct 2015 03:33:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gyP80GsXm9SJaqRO/mayVxBbU1oM7dYNdfNug2jmxjE=; b=bohIt2LFhaf6foqockrVXpea9sFIkiKuHEUyWBN0Te7FheNK4/oav7IcB6Nvf9xM/1 WvnrHL1Rc68mD8zZggLpNNfXlxmDBctivippCG4Rf/98Lr7MDAsiK5m07eRQGfzq816W G9PsA/D3ixif30eXBFD0h2ireoMqGb4PP3VKEB5wmWfALuMQEyMX18ADz6EorUCzLwm6 LHtvfigU8YKrqFkXBTl7W3A4QHb6m+jNSoQwh7ru1OSk1sp2GPeOY9sdKGKMBRuCDZ6g XdFOqZp0CTVHtzYtqGHJmwOYZCa68qGkAmuf2sFDOh0DyWcOheAA1x3QzsXh3ud2t8Gn xUxQ== X-Received: by 10.180.90.166 with SMTP id bx6mr9624724wib.93.1445078003838; Sat, 17 Oct 2015 03:33:23 -0700 (PDT) Received: from tipsey.3.home (188.30.104.3.threembb.co.uk. [188.30.104.3]) by smtp.gmail.com with ESMTPSA id fz2sm6645803wic.2.2015.10.17.03.33.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 Oct 2015 03:33:23 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 6/9] staging: vt6655: remove static inline alloc_rd_info. Date: Sat, 17 Oct 2015 11:32:59 +0100 Message-Id: <1445077982-17832-6-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1445077982-17832-1-git-send-email-tvboxspy@gmail.com> References: <1445077982-17832-1-git-send-email-tvboxspy@gmail.com> 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 Since this only contains one function and only used twice remove inline altogether. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/device.h | 5 ----- drivers/staging/vt6655/device_main.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index aca6e00..0002049 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -306,11 +306,6 @@ struct vnt_private { struct ieee80211_low_level_stats low_stats; }; -static inline struct vnt_rd_info *alloc_rd_info(void) -{ - return kzalloc(sizeof(struct vnt_rd_info), GFP_ATOMIC); -} - static inline struct vnt_td_info *alloc_td_info(void) { return kzalloc(sizeof(struct vnt_td_info), GFP_ATOMIC); diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 8bca3fc..aa8f750 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -551,7 +551,7 @@ static void device_init_rd0_ring(struct vnt_private *priv) for (i = 0; i < priv->sOpts.rx_descs0; i ++, curr += sizeof(struct vnt_rx_desc)) { desc = &priv->aRD0Ring[i]; - desc->rd_info = alloc_rd_info(); + desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_ATOMIC); if (!device_alloc_rx_buf(priv, desc)) dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); @@ -575,7 +575,7 @@ static void device_init_rd1_ring(struct vnt_private *priv) for (i = 0; i < priv->sOpts.rx_descs1; i ++, curr += sizeof(struct vnt_rx_desc)) { desc = &priv->aRD1Ring[i]; - desc->rd_info = alloc_rd_info(); + desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_ATOMIC); if (!device_alloc_rx_buf(priv, desc)) dev_err(&priv->pcid->dev, "can not alloc rx bufs\n");