From patchwork Thu Feb 2 11:19:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 139117 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 56722104785 for ; Thu, 2 Feb 2012 22:19:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755477Ab2BBLTg (ORCPT ); Thu, 2 Feb 2012 06:19:36 -0500 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:41161 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753917Ab2BBLTe (ORCPT ); Thu, 2 Feb 2012 06:19:34 -0500 Received: by lagu2 with SMTP id u2so1211951lag.19 for ; Thu, 02 Feb 2012 03:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=8p163X3LVD//2gWUqffhOeXjhSLXBa7qwg+np/CERo4=; b=ndMbH96KefBVJHQfrFSIZfeY7m3/OrUbmz3ieeE3/DkMcU9eagPdM1/puPk+4Kj7iB UygjpmCPfFHOf/UPr0HEzUb1FJTtfs+ij5Jy2YJXa0RQPBq4l3vhA3Fmw/cfy7ykY4bj J/x1/YS2M9Xl2n5F62j0eVdHIVUBQf+m4As4g= Received: by 10.112.39.136 with SMTP id p8mr600319lbk.79.1328181573213; Thu, 02 Feb 2012 03:19:33 -0800 (PST) Received: from localhost.localdomain ([212.4.57.94]) by mx.google.com with ESMTPS id sv10sm1756696lab.14.2012.02.02.03.19.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Feb 2012 03:19:29 -0800 (PST) From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= To: netdev@vger.kernel.org, davem@davemloft.net Cc: sjurbren@gmail.com, =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCH net-next 1/3] caif: Fix compile warning Date: Thu, 2 Feb 2012 12:19:23 +0100 Message-Id: <1328181565-13781-1-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix compile warning: ... warning: statement with no effect [-Wunused-value] This warning is seen when debug-fs is disabled. Fix this by adding new macro for use when no return value is needed. Signed-off-by: Sjur Brændeland --- net/caif/caif_socket.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index a986280..543f23c 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -60,11 +60,13 @@ struct debug_fs_counter { atomic_t num_rx_flow_on; }; static struct debug_fs_counter cnt; -#define dbfs_atomic_inc(v) atomic_inc_return(v) -#define dbfs_atomic_dec(v) atomic_dec_return(v) +#define dbfs_atomic_inc(v) atomic_inc(v) +#define dbfs_atomic_dec(v) atomic_dec(v) +#define dbfs_atomic_inc_ret(v) atomic_inc_return(v) #else -#define dbfs_atomic_inc(v) 0 -#define dbfs_atomic_dec(v) 0 +#define dbfs_atomic_inc_ret(v) 0 +#define dbfs_atomic_inc(v) +#define dbfs_atomic_dec(v) #endif struct caifsock { @@ -1122,7 +1124,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, cf_sk->conn_req.protocol = protocol; /* Increase the number of sockets created. */ dbfs_atomic_inc(&cnt.caif_nr_socks); - num = dbfs_atomic_inc(&cnt.caif_sock_create); + num = dbfs_atomic_inc_ret(&cnt.caif_sock_create); #ifdef CONFIG_DEBUG_FS if (!IS_ERR(debugfsdir)) {