From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760224Ab3BLERp (ORCPT ); Mon, 11 Feb 2013 23:17:45 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:56197 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755998Ab3BLERn (ORCPT ); Mon, 11 Feb 2013 23:17:43 -0500 From: Cyril Roelandt To: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Cc: Cyril Roelandt , gregkh@linuxfoundation.org, wfp5p@virginia.edu, tt.rantala@gmail.com, jslaby@suse.cz, sfr@canb.auug.org.au, devel@driverdev.osuosl.org Subject: [PATCH 3/5] staging: dgrp: remove redundant NULL check before unregister_dgrp_device(). Date: Tue, 12 Feb 2013 05:01:51 +0100 Message-Id: <1360641713-24895-4-git-send-email-tipecaml@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360641713-24895-1-git-send-email-tipecaml@gmail.com> References: <1360641713-24895-1-git-send-email-tipecaml@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org unregister_dgrp_device on a NULL pointer is a no-op, so the NULL checks in dgrp_remove_nd() can be removed. Signed-off-by: Cyril Roelandt --- drivers/staging/dgrp/dgrp_specproc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/dgrp/dgrp_specproc.c b/drivers/staging/dgrp/dgrp_specproc.c index dfdaede..13c7ccf 100644 --- a/drivers/staging/dgrp/dgrp_specproc.c +++ b/drivers/staging/dgrp/dgrp_specproc.c @@ -777,14 +777,11 @@ static int dgrp_remove_nd(struct nd_struct *nd) dgrp_remove_node_class_sysfs_files(nd); } - if (nd->nd_mon_de) - unregister_dgrp_device(nd->nd_mon_de); + unregister_dgrp_device(nd->nd_mon_de); - if (nd->nd_ports_de) - unregister_dgrp_device(nd->nd_ports_de); + unregister_dgrp_device(nd->nd_ports_de); - if (nd->nd_dpa_de) - unregister_dgrp_device(nd->nd_dpa_de); + unregister_dgrp_device(nd->nd_dpa_de); dgrp_tty_uninit(nd); -- 1.7.10.4