From patchwork Fri Jun 1 13:04:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10443371 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 14B4D601D3 for ; Fri, 1 Jun 2018 13:08:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0827F28DA3 for ; Fri, 1 Jun 2018 13:08:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F054A28DA5; Fri, 1 Jun 2018 13:08:03 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable 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 96F2F28D9F for ; Fri, 1 Jun 2018 13:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208AbeFANFI (ORCPT ); Fri, 1 Jun 2018 09:05:08 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:40729 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbeFANFC (ORCPT ); Fri, 1 Jun 2018 09:05:02 -0400 Received: by mail-lf0-f65.google.com with SMTP id q11-v6so14742921lfc.7 for ; Fri, 01 Jun 2018 06:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=klNHnRH41ORWJDR4qMk2ThBdGB5ZX9z6xM9YvxrosaA=; b=aAWJSHNe6rL4Q4ZyHZdHVhr9Vub6oTf34Ku5bWlj7Cfv7h7hyZh5ku8TkSGbLilJ1D gntZ+8ERIWvQq31KQzmxrsmYaiSho2g9KekRfHcQ0dJfPcGXpg5nQclVwkmcPWvmzj0b H1WMzKkVILZfa5Xny1ZDJRp2ThBoXu0k5CyqvOH3GWs1bNTG1CT6jhcc7Gc+51o95ASE MRPGdfdvKhJkY9c1XuNSsjompVzyuDGFBziGFMXMKh4hYG0yNy84qq0etFeP8S9HiQrW 51t8DjJkQVI5Fhl6VGLhCJQoX+ERqh16RbPgnne35d1XeK9xs/8s/vcTIDM2wxUZwbV1 2n6A== 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=klNHnRH41ORWJDR4qMk2ThBdGB5ZX9z6xM9YvxrosaA=; b=GZObb4lCztGGJK6ZThu7ds/2WuSMBRLchIibTxbV9W4KvpBOK+66lbD6/ygAiDx6LE Y2aK52WqCZLKzB3e/b+pwDnENpclaZ5PRjYrScoGRBoMISDKbVYZ0E12ClX3V5xDaueq 6pvix5UfYFRJOojdhkkHUXtEGgZuyn5nnJ2xygzw1Gk948SZ9lb2wwyw2FlTWOtNrnx3 mWg838k2huuvUKZSZS+TVAh5C2W729km0Mkc6BEI+98snd0JcCZMNK1b6pUky7jJfLMR V5h+TatK9QPnfuo27gGF7jwddhNlEoLK1bZ3XJdw9frs6Kvv/s1ND8rcszezT4ofGck5 4gJw== X-Gm-Message-State: ALKqPwfZNJk+C055d6BL7mqW/wIGcj2dxGWkm3mCv9OQB8gfRPNcM87n M6S1HuIPet4PNV62K+/8v+J8zQ== X-Google-Smtp-Source: ADUXVKLL/tja+u2bCuFMQlEEpDP9PKicsC/l1hg9HR51IMvJnuGdrooediyknT7Yhc9LAA/vad9HOA== X-Received: by 2002:a19:7906:: with SMTP id u6-v6mr6609365lfc.34.1527858301097; Fri, 01 Jun 2018 06:05:01 -0700 (PDT) Received: from Macroninja.cnexlabs.com (95-166-82-66-cable.dk.customer.tdc.net. [95.166.82.66]) by smtp.gmail.com with ESMTPSA id g5-v6sm303161lje.21.2018.06.01.06.04.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jun 2018 06:05:00 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, javier@cnexlabs.com, igor.j.konopko@intel.com, marcin.dziegielewski@intel.com, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 08/18] lightnvm: pblk: remove unnecessary argument Date: Fri, 1 Jun 2018 15:04:22 +0200 Message-Id: <20180601130432.30866-9-mb@lightnvm.io> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180601130432.30866-1-mb@lightnvm.io> References: <20180601130432.30866-1-mb@lightnvm.io> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Javier González Remove unnecessary argument on pblk_line_free() Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 6 +++--- drivers/lightnvm/pblk-init.c | 2 +- drivers/lightnvm/pblk.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 0d4078805ecc..4b10122aec89 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -1337,7 +1337,7 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, retry_line->emeta = line->emeta; retry_line->meta_line = line->meta_line; - pblk_line_free(pblk, line); + pblk_line_free(line); l_mg->data_line = retry_line; spin_unlock(&l_mg->free_lock); @@ -1562,7 +1562,7 @@ struct pblk_line *pblk_line_replace_data(struct pblk *pblk) return new; } -void pblk_line_free(struct pblk *pblk, struct pblk_line *line) +void pblk_line_free(struct pblk_line *line) { kfree(line->map_bitmap); kfree(line->invalid_bitmap); @@ -1584,7 +1584,7 @@ static void __pblk_line_put(struct pblk *pblk, struct pblk_line *line) WARN_ON(line->state != PBLK_LINESTATE_GC); line->state = PBLK_LINESTATE_FREE; line->gc_group = PBLK_LINEGC_NONE; - pblk_line_free(pblk, line); + pblk_line_free(line); spin_unlock(&line->lock); atomic_dec(&gc->pipeline_gc); diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index 8f8c9abd14fc..b52855f9336b 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -509,7 +509,7 @@ static void pblk_lines_free(struct pblk *pblk) for (i = 0; i < l_mg->nr_lines; i++) { line = &pblk->lines[i]; - pblk_line_free(pblk, line); + pblk_line_free(line); pblk_line_meta_free(line); } spin_unlock(&l_mg->free_lock); diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h index 9c682acfc5d1..dfbfe9e9a385 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h @@ -766,7 +766,7 @@ struct pblk_line *pblk_line_get_data(struct pblk *pblk); struct pblk_line *pblk_line_get_erase(struct pblk *pblk); int pblk_line_erase(struct pblk *pblk, struct pblk_line *line); int pblk_line_is_full(struct pblk_line *line); -void pblk_line_free(struct pblk *pblk, struct pblk_line *line); +void pblk_line_free(struct pblk_line *line); void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line); void pblk_line_close(struct pblk *pblk, struct pblk_line *line); void pblk_line_close_ws(struct work_struct *work);