From patchwork Sun Nov 18 06:25:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 199894 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 D920F2C008F for ; Sun, 18 Nov 2012 17:25:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666Ab2KRGZY (ORCPT ); Sun, 18 Nov 2012 01:25:24 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:47794 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752312Ab2KRGZX (ORCPT ); Sun, 18 Nov 2012 01:25:23 -0500 Received: by mail-qc0-f174.google.com with SMTP id o22so2545385qcr.19 for ; Sat, 17 Nov 2012 22:25:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=D2SO/5+O358HoeBlDS9u5i6ECE/TfGOi/F3yCBPtZ6k=; b=U/JLEjGcxQ2ukW1FJ7JSYA7ajad279R1CKpEtl619eNmAE9WF5wRPz1zQoVqmB4lxn NfN2eQkyIiobajLXSmyMxlYEkULzqOEPW6zfFwIej8DraC+/6aKPuQCvGT7ZQXLvqTvP PNqZg37ZF0GO2PSvdoKHSC1OzLjiOcPGr7vSG18P6hRpUw8yB6rAUTFK2cMgfvcwWbd9 C5bLcaJEbtm/URhef/0qwW/a1MGqQ9puLVdcg5l0ei2FuTja/ggoCJYEjGL4BWFwHMYE 0ZAq6041GHtvnVo695YugSbhx3rEONCbp8Bd87p5aJJjttMwykpJY4+JEhPTKHa6eFAU oSDQ== Received: by 10.224.35.137 with SMTP id p9mr8480262qad.85.1353219922876; Sat, 17 Nov 2012 22:25:22 -0800 (PST) Received: from hchen.lcs.mit.edu (hchen.csail.mit.edu. [18.26.5.5]) by mx.google.com with ESMTPS id jw1sm3511871qeb.13.2012.11.17.22.25.21 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 17 Nov 2012 22:25:22 -0800 (PST) From: Xi Wang To: Krzysztof Halasa Cc: netdev@vger.kernel.org, Xi Wang , Andrew Morton Subject: [PATCH RFC 2/2] ixp4xx_hss: avoid calling dma_pool_create() with NULL dev Date: Sun, 18 Nov 2012 01:25:10 -0500 Message-Id: <1353219910-24690-2-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353219910-24690-1-git-send-email-xi.wang@gmail.com> References: <1353219910-24690-1-git-send-email-xi.wang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use &port->netdev->dev instead of NULL since dma_pool_create() doesn't allow NULL dev. Signed-off-by: Xi Wang Cc: Andrew Morton --- See also https://lkml.org/lkml/2012/11/14/11 --- drivers/net/wan/ixp4xx_hss.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 3f575af..e9a3da5 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c @@ -969,10 +969,12 @@ static int init_hdlc_queues(struct port *port) { int i; - if (!ports_open) - if (!(dma_pool = dma_pool_create(DRV_NAME, NULL, - POOL_ALLOC_SIZE, 32, 0))) + if (!ports_open) { + dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev, + POOL_ALLOC_SIZE, 32, 0); + if (!dma_pool) return -ENOMEM; + } if (!(port->desc_tab = dma_pool_alloc(dma_pool, GFP_KERNEL, &port->desc_tab_phys)))