From patchwork Mon May 28 08:58:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10430163 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 C0930602CC for ; Mon, 28 May 2018 09:04:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B15F828BDC for ; Mon, 28 May 2018 09:04:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A62EC28BE2; Mon, 28 May 2018 09:04:54 +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=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 2764128BDC for ; Mon, 28 May 2018 09:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbeE1JEw (ORCPT ); Mon, 28 May 2018 05:04:52 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:38813 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754189AbeE1I7B (ORCPT ); Mon, 28 May 2018 04:59:01 -0400 Received: by mail-wm0-f66.google.com with SMTP id m129-v6so30002136wmb.3 for ; Mon, 28 May 2018 01:59:00 -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=fr77ioCtdaKpY//mk832I4GFTKfEaxwLpaQ/rJB99jtGP45LmQabF4MR2wMvxnyNDI whD9WDRzASgW3S0otaJeT7fNr0IBg5uIhzM3HmJU3CsecdB2MhXsceR+G4gUCOaGOyV4 OkNCYPW8P0QiUvR1RuVRjTKLbXQVD0DfXFwg0EciTvayxPnzmJodVl606cV7UazJQQuJ r61P/mzmaypn970TVvfV6fHvHb7Y7CuSCgPOldganIx6JWusBv6UZ7pUBYnldxI4Ks8f yfPblTMiwyYk1XYDqn3WKytd2vklura5R0Yvhm45+WdeKKG7qDLhdq5yhqrBSLVmq41L XShA== 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=WQv4wsPrrHXqr8QRaPvQOrs+Jhy/yhHramkDhcFDKIZNhBhxzZ+tRIh9wRDZgdxFpw igBF2qnoPVyJyn/kFJVNYbiQKx2zN9ySEOXYvfVr9zyO7jqjwFqiIs7k+Ffd87cAdRzj Yp2M1zsZ/e2NIZ4nwltQH0IK5basKJscN4Svpyci3sbRsuB6n07QYTDb7DN59GJsEnym gmWfIi4Dv4rkbhkbSFDMOiNtU+fD0xdDzxgWmU9WbyCn5VjMzFcHfXr0ri0EFbs4FuOD BlZ2vKMCtHXSRE4gqyEdb6xsp4enReTkbJtc7tQ4i+2PORpY3isJXsRqXs6gV7yLW5YR Nd0Q== X-Gm-Message-State: ALKqPweLklJO8YPfPeIJe+5f6iH3VZazCTCln4okDIoXUp4u6D0u/dRk I4EmKNss26H8XbfZTzA4C1n4BQ== X-Google-Smtp-Source: ADUXVKIwgmyhYvN+6JxWaxilBxofeUzVpOSzHojl1/EbhYIZJ78bV5r48HVJdCbMt+QT6OrHXF6kNA== X-Received: by 2002:a2e:5718:: with SMTP id l24-v6mr7688881ljb.51.1527497939620; Mon, 28 May 2018 01:58:59 -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 u2-v6sm5777848lji.4.2018.05.28.01.58.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 01:58:58 -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, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 08/20] lightnvm: pblk: remove unnecessary argument Date: Mon, 28 May 2018 10:58:29 +0200 Message-Id: <20180528085841.26684-9-mb@lightnvm.io> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180528085841.26684-1-mb@lightnvm.io> References: <20180528085841.26684-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);