From patchwork Mon Oct 12 15:27:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 35776 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.176.167]) by ozlabs.org (Postfix) with ESMTP id C5B54B7B81 for ; Tue, 13 Oct 2009 02:56:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932620AbZJLPjp (ORCPT ); Mon, 12 Oct 2009 11:39:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932258AbZJLPjo (ORCPT ); Mon, 12 Oct 2009 11:39:44 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:54490 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932367AbZJLPjm (ORCPT ); Mon, 12 Oct 2009 11:39:42 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id n9CFRtG2005754; Mon, 12 Oct 2009 16:27:55 +0100 From: Alan Cox Subject: [PATCH 2/2] ethoc: fix warning from 32bit build To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 12 Oct 2009 16:27:55 +0100 Message-ID: <20091012152753.5694.18204.stgit@localhost.localdomain> In-Reply-To: <20091012152247.5694.77290.stgit@localhost.localdomain> References: <20091012152247.5694.77290.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org drivers/net/ethoc.c: In function ‘ethoc_open’: drivers/net/ethoc.c:667: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Alan Cox --- drivers/net/ethoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 96f5b2a..402a507 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -664,7 +664,8 @@ static int ethoc_open(struct net_device *dev) return ret; /* calculate the number of TX/RX buffers, maximum 128 supported */ - num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); + num_bd = min_t(unsigned int, + 128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); priv->num_tx = max(min_tx, num_bd / 4); priv->num_rx = num_bd - priv->num_tx; ethoc_write(priv, TX_BD_NUM, priv->num_tx);