Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp2772352imm; Thu, 9 Aug 2018 20:41:51 -0700 (PDT) X-Google-Smtp-Source: AA+uWPz8GpBqH48OuT5OVhQ6fqV6qR1GZxv+aAAaDHzrQr29rtM3qQ6+sxHrZgBeqANvdsX/LZ8M X-Received: by 2002:a62:b604:: with SMTP id j4-v6mr5155406pff.199.1533872511842; Thu, 09 Aug 2018 20:41:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533872511; cv=none; d=google.com; s=arc-20160816; b=jtSeH9ghguaDg/heHybykDWKjvEbEaLRtEQiScs3dO0vRvoFQF2LeMxKwAX3Ki4miW nTnvOKjmyv/bWO50ovA9DxfWjo/Q3UR3P2wxavV4fK4/mJd6+4Ju5dTw7qgnI23hJsYq K0wCoz+gRbZVmHlP1KrbXV8K/QCcTc6+5qq+o+4oZTallb4mEmAEdD8YggKpBxgBPHui lN00+ERN6NjlXTudqywLpSR5akowgcSCknIGImcUM7S10SgNmshwrYEr5pJifYpKKPnE j0vAWr0aUW1E5oMdcxaBcA/HI0LLIGx0AoJOPpKyqwjP/qZChE6Djjc3iMvrgJIBF02p 05Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=/Uu4yq9mlG0JgfVfBKVMHEaDb+WHU5AbpHdC1hwSdUY=; b=Mfa1jFUW9KWq7z4rbGI34C4/iaZoXEv9u6fDzilDpTXqR/jCoSPzWs7ZVmTmbuPh2i mtAdiA5i8NZfsOQ6LeJR+21exL06iQdir6OUCe1qIbkuv1JISxzdj+N674u9q/eYWx/u Y5tNeMgE4u0qhZhK6QSYbQxNzTQ1d9ks94FWv+fyBEPJEcTUyPnhod+rl6TOWA5j/yFx 6sUuxk9g1ARk4oH9R6B7LE6yRghklTMFKO3cBPbA0D00VaMbqWDnFVCv0R8v9Dgjh+/C OX4Ny13FiwNd7vQQ3l7IJGzKPOzyhYdB3HTVxNTcCB8zRsQHbnKFnUiJcpu6mrgCJa7X ezeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=e3cdaKsX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si8942572pgj.224.2018.08.09.20.41.24; Thu, 09 Aug 2018 20:41:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=e3cdaKsX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727773AbeHJFuT (ORCPT + 99 others); Fri, 10 Aug 2018 01:50:19 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:41915 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725917AbeHJFtX (ORCPT ); Fri, 10 Aug 2018 01:49:23 -0400 Received: by mail-pf1-f194.google.com with SMTP id y10-v6so3824055pfn.8 for ; Thu, 09 Aug 2018 20:21:30 -0700 (PDT) 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=/Uu4yq9mlG0JgfVfBKVMHEaDb+WHU5AbpHdC1hwSdUY=; b=e3cdaKsXD2lwFcq6kXE/1eASobb1W1ePUtX6YbDuxRK/BRr/Hujp2QFPqRwVcYaj71 ul0WBGet+O0G84ydCfclULKqC/1gHcDKS2K4sNkLCKWiBmbxEWFex1tDcXbvsHCC4Xvw iUdNOTaqWLk2tpH8P+bB66CkF19bhdyUYu7o1OXHtUIuhqMlQbNboDWFaHqhL6szQIq9 Ns3yNeZoiF+fgLmiNNFjWtMRXKJGkK2+YArgIibtHWWICJLpz9pwuw9ePc3RFihHtxbr H3L6WwDlKH/HmdY6B2sDROEzZ7MYMeqy6Mdy1SE5EcsH1bQIJKj2aTK1HUFqxcfdURTG RaPw== 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=/Uu4yq9mlG0JgfVfBKVMHEaDb+WHU5AbpHdC1hwSdUY=; b=OlyjDzzROcqM1/DCO9xfNIRkgKPhLeqzCB9aiyxrJ0/Fo1kqrLSooXaMpKBtuTMZ0y C7lkBnFw8iW2kv4/0vCiVhGVzS8dZPxk0bmJg0UqeW3Y34Clz5QgEuxzUcXLQIn7Sa8r K5C42zSZOZZ8Zzao5It7e/MX9wOcgRPYfGOCjRB91ulf3weLTN7/kzYb5gymwJLiuj+D xiC8x28Wrc0zEQVnDvvqzd88aYyKbzQMj9Aoz8kJENDPXhrREcco6sxxHd4uDKuaC51m ryStq7TUd1bBqq493osMr2pHn+VKVMr6jQiFYJfix56lp3eY8DL4r89YglGjJeTtnBu1 w6xA== X-Gm-Message-State: AOUpUlHelCyS+Pqa5MHbP4BRwfh6PBNnHezUtwZOD2ulrD6pPH33sOV5 2j/dBOkuhGYRVgKTjM0TQS4= X-Received: by 2002:a62:2e02:: with SMTP id u2-v6mr5084743pfu.134.1533871289777; Thu, 09 Aug 2018 20:21:29 -0700 (PDT) Received: from toddpoynor2.mtv.corp.google.com ([2620:0:1000:3701:7d29:cd13:d903:7908]) by smtp.gmail.com with ESMTPSA id p73-v6sm16130871pfk.186.2018.08.09.20.21.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 20:21:29 -0700 (PDT) From: Todd Poynor To: Rob Springer , John Joseph , Ben Chan , Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Todd Poynor Subject: [PATCH 07/16] staging: gasket: page table: remove unnecessary NULL check Date: Thu, 9 Aug 2018 20:21:02 -0700 Message-Id: <20180810032111.197743-8-toddpoynor@gmail.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog In-Reply-To: <20180810032111.197743-1-toddpoynor@gmail.com> References: <20180810032111.197743-1-toddpoynor@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Todd Poynor gasket_alloc_coherent_memory remove unnecessary NULL check for coherent_pages. Signed-off-by: Todd Poynor --- drivers/staging/gasket/gasket_page_table.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c index d4c5f8aa7dd34..bd921dc6094de 100644 --- a/drivers/staging/gasket/gasket_page_table.c +++ b/drivers/staging/gasket/gasket_page_table.c @@ -1328,10 +1328,8 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size, num_pages * PAGE_SIZE, mem, handle); } - if (gasket_dev->page_table[index]->coherent_pages) { - kfree(gasket_dev->page_table[index]->coherent_pages); - gasket_dev->page_table[index]->coherent_pages = NULL; - } + kfree(gasket_dev->page_table[index]->coherent_pages); + gasket_dev->page_table[index]->coherent_pages = NULL; gasket_dev->page_table[index]->num_coherent_pages = 0; return -ENOMEM; } -- 2.18.0.597.ga71716f1ad-goog