Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp241081imm; Fri, 13 Jul 2018 23:00:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf9AI47wH4DKY6uZ8NfP8hTbWdnLtRKhXrOveHVwaF0Qop873gDWakMpE9nfgxYG1Af6qbJ X-Received: by 2002:a62:a119:: with SMTP id b25-v6mr9778291pff.163.1531548022603; Fri, 13 Jul 2018 23:00:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531548022; cv=none; d=google.com; s=arc-20160816; b=CkRPYctklQK4cBjfPX0aAfajN5SEQ8AmmTxtMpV3OivacNihUdSA/Ftg1okyyWpipW kXf1kUpAblUhptapjCFpaGS2qu8TEK1vwoIdPGV/dB4/iYNtXqTJFl7LE0BbS0FhtHc9 1gw5FcsqPVv2dnRa8ahHNXdjcH+3vc5zQK3Rpr2W14+1ThcAbDq9A8zqUuAZIJqsF7ng VBVLoUxu5MM4vQeHYOPSx0uaN4tpaH6UZPMLv4YqBhoTWdK8HhUVbbKx1KTwuBuN17QQ OOUl6CNYn3twVB2/PPT0Qaj8r+ExwS825sFexYZRi1vj/ErrS9bl3R4zJ7b/a5szq3+s 6ilw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=6EM97rsFq+9hQv687+Lefl9itMDbgHYkCLKPBFfaRRE=; b=aC2jLjV37srIykJ5meffbe45YU+XazKZGs1CGF+FEP9BwxDJUa0XYNPqkLdHhPOvyE jf168n/o1m+HjvbDiuI15vNLMpdDFxj334DGwsqtL+YF1Qlx7dWRfMog93rVa3y3Aql/ 0pWEDXlEXbnIjh8g6DCmYwdg7KQa/gKb1KGelHWJCYiw8o+/x4faThePA8cfKbIL42ch 8iaMk4d2WhsanXiTOvU6cZPtVBcjKjiYoJrGTMmo47s4Nps2xVO2u1SwzSobVIG94Q0E CEuRDDgdeKcH/7WrK4XWdbqts5hf/8O+3oLYebUiLAlZ2TosqckwhWdr4UCpZ0akPold BFzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=rnkihJCY; 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 r70-v6si25791401pfa.44.2018.07.13.22.59.59; Fri, 13 Jul 2018 23:00:22 -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=rnkihJCY; 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 S1730922AbeGNGQu (ORCPT + 99 others); Sat, 14 Jul 2018 02:16:50 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:37071 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730209AbeGNGQt (ORCPT ); Sat, 14 Jul 2018 02:16:49 -0400 Received: by mail-pf0-f194.google.com with SMTP id a26-v6so1670410pfo.4 for ; Fri, 13 Jul 2018 22:58:59 -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; bh=6EM97rsFq+9hQv687+Lefl9itMDbgHYkCLKPBFfaRRE=; b=rnkihJCYzU6sGJWKYJyzJkvm+7gp/GTNFxo6c+5pfQGcZq0B+56NEjU7b1gywM5Psc 5bt9you8oe3adeWfQ3/jjZHnHRi1N2Rwodl1HmksJ+G9TqMQjtGBcTq9DRvm1YoobzPH GfRqbXyTDAwdbHffzTshlIF0hAHPug/2WrrW99Thf4fJ0vaKlea9UfI9VKONXvPDZdyz 8it9WZ/GwUrkR+5424naqyMs/WaFACdfNFMF5+GsBLA1PIkWmRFKiPsRxULIBMV6WSBd R6Oc/EYs66w6yE70146FhilZogFM+zzGSZiS2EoMMhis+sU/+/VjXHz/8ST5PqbtoeB1 4dxQ== 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; bh=6EM97rsFq+9hQv687+Lefl9itMDbgHYkCLKPBFfaRRE=; b=XMU6NdNzjizs9Gh9tbFCIAe/IqBbTVIZ3UdQy759eEbA/NzZOxmFYBOudUFG7Xg5UA P9AyKYjJqvTgBTBtjEdaOYVasBA1gx80ss10zO/CxTFw80Y33jrk81z5QPczIArBZk4d JX3oP1YU38jdDjuAHRCvUr+//jEnhP/2y1/gxJOvK72mBc8NU/sDSkso61/HY8fApBmc H6mDkZW/WrZCXMRYOcyvMy9RJ77Ggdds/hiLFsHqT/ZG0N8bhRMkDez5GqTNrgcm/4lX bWdCQe6S/2BJceNUvuSXcYwSqCsvkQyGZksvOnm70IuocQfxveRjYFYY+0i2pzS+onmb K69g== X-Gm-Message-State: AOUpUlHC/3DzOT4++ygprmy3/d2xsqqXyIxko9KUzvfpRC+nRN1edEHo baYjGX3pIqXVWmWkuZM6OqU= X-Received: by 2002:a62:f704:: with SMTP id h4-v6mr9991895pfi.169.1531547939054; Fri, 13 Jul 2018 22:58:59 -0700 (PDT) Received: from toddpoynor2.mtv.corp.google.com ([2620:0:1000:3701:7d29:cd13:d903:7908]) by smtp.gmail.com with ESMTPSA id 203-v6sm48411112pgb.14.2018.07.13.22.58.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 22:58:58 -0700 (PDT) From: Todd Poynor To: Rob Springer , John Joseph , Ben Chan , Greg Kroah-Hartman Cc: Zhongze Hu , Simon Que , Dmitry Torokhov , Guenter Roeck , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Todd Poynor Subject: [PATCH 15/18] staging: gasket: remove unnecessary code in coherent allocator Date: Fri, 13 Jul 2018 22:58:13 -0700 Message-Id: <20180714055816.223754-16-toddpoynor@gmail.com> X-Mailer: git-send-email 2.18.0.203.gfac676dfb9-goog In-Reply-To: <20180714055816.223754-1-toddpoynor@gmail.com> References: <20180714055816.223754-1-toddpoynor@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Todd Poynor Remove extraneous statement in gasket_config_coherent_allocator() Reported-by: Dmitry Torokhov Signed-off-by: Zhongze Hu Signed-off-by: Todd Poynor --- drivers/staging/gasket/gasket_ioctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c index 0c1e0723bef1..fcf58f44efed 100644 --- a/drivers/staging/gasket/gasket_ioctl.c +++ b/drivers/staging/gasket/gasket_ioctl.c @@ -427,10 +427,8 @@ static int gasket_config_coherent_allocator( if (ibuf.page_table_index >= gasket_dev->num_page_tables) return -EFAULT; - if (ibuf.size > PAGE_SIZE * MAX_NUM_COHERENT_PAGES) { - ibuf.size = PAGE_SIZE * MAX_NUM_COHERENT_PAGES; + if (ibuf.size > PAGE_SIZE * MAX_NUM_COHERENT_PAGES) return -ENOMEM; - } if (ibuf.enable == 0) { ret = gasket_free_coherent_memory( -- 2.18.0.203.gfac676dfb9-goog