From patchwork Fri Aug 17 11:09:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 10787 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C325B23E37 for ; Fri, 17 Aug 2012 11:11:36 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8DA72A181FD for ; Fri, 17 Aug 2012 11:11:36 +0000 (UTC) Received: by ghbg10 with SMTP id g10so4042016ghb.11 for ; Fri, 17 Aug 2012 04:11:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=60vgdB0BiCzPWWFf1+2kG0naLs3P0yTSsr4fOHZb/wI=; b=BBYRAY1UCxbUrfrD7+3ur/vdpjKatZ80BeGd/ywePi/shYvB29ZQRQlQDqTNwcjkHb MjwJt45LtgKhOCViZOgUMGZHRy+RadN3t0hwOdTdOqhH3wdn+hFxrYDccbzGFe8U2KEY RfC/oaY12Hko1IO1+3wuaH929LLlYJ+pyAoV/V16VS9K17XQsU4oGCZcR8hHLBiJ1TwT kBHZhQLCB/QWqg5Rx3VY0Q6Y4Xe88utO0PpvIDSdYdTva6YBj59oMzG3z6Sq+dILZgIp g0HnHoSIzayRL2cp+BV1fNE5GKYgT73QHYyVpPPS84r0O32ETnV1qCgBAo72BgZADJOZ n4PQ== Received: by 10.50.170.3 with SMTP id ai3mr1508126igc.9.1345201895908; Fri, 17 Aug 2012 04:11:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp182070igc; Fri, 17 Aug 2012 04:11:35 -0700 (PDT) Received: by 10.236.170.135 with SMTP id p7mr7362083yhl.109.1345201895129; Fri, 17 Aug 2012 04:11:35 -0700 (PDT) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id s62si6857701yhm.77.2012.08.17.04.11.34 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Aug 2012 04:11:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by yenm2 with SMTP id m2so4464542yen.37 for ; Fri, 17 Aug 2012 04:11:34 -0700 (PDT) Received: by 10.66.87.66 with SMTP id v2mr8667285paz.71.1345201894394; Fri, 17 Aug 2012 04:11:34 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id iq1sm4723254pbc.37.2012.08.17.04.11.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Aug 2012 04:11:33 -0700 (PDT) From: Sachin Kamat To: devel@driverdev.osuosl.org Cc: gregkh@linuxfoundation.org, sachin.kamat@linaro.org, patches@linaro.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Subject: [PATCH 2/2] Staging: android: binder: Remove an inconsequential conditional macro Date: Fri, 17 Aug 2012 16:39:37 +0530 Message-Id: <1345201777-31950-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1345201777-31950-1-git-send-email-sachin.kamat@linaro.org> References: <1345201777-31950-1-git-send-email-sachin.kamat@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmC1rCubZKAybMvHistKPo0ehED9M8IfPCqZJl5z5Mdi81LOv1/zGxehjl1vged+H5Et+7M Removes an inconsequential conditional macro. Cc: Arve Hjønnevåg Signed-off-by: Sachin Kamat --- drivers/staging/android/binder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 668bec7..a807129 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -415,13 +415,13 @@ repeat: else __clear_close_on_exec(fd, fdt); files->next_fd = fd + 1; -#if 1 + /* Sanity check */ if (fdt->fd[fd] != NULL) { pr_warn("get_unused_fd: slot %d not NULL!\n", fd); fdt->fd[fd] = NULL; } -#endif + error = fd; out: