From patchwork Sun Nov 18 06:25:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 199893 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 D20412C008F for ; Sun, 18 Nov 2012 17:25:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752370Ab2KRGZX (ORCPT ); Sun, 18 Nov 2012 01:25:23 -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 S1750981Ab2KRGZW (ORCPT ); Sun, 18 Nov 2012 01:25:22 -0500 Received: by mail-qc0-f174.google.com with SMTP id o22so2545385qcr.19 for ; Sat, 17 Nov 2012 22:25:21 -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; bh=HqCfVJxS2K/kQc/yeBCecXDoN4orVts1qXXNYdJI+sw=; b=ESKRp0Ttx41hQHQi7eS3WNkoHz7Df7m/AF69a28+TfI3K7Vp4GN2wDJ7E9IkQjZ6BM bxk135Ojt63UnjaXduO7ndji3TaH1ZnGOWLgT6if8hRujk4XUYZcrDPcmeplaOBzUt6E /nN3MJ6hTsZB/vo6UymOA9/j9WkJVoeKne0CUM/5QHnxWqvS4phoMmBzb2S8cDAUqPZr woeytDqvh29jsGdYPvpkC8AzLeJsa0ngWTR+nvQcEDtmzZDLwEqPcWYlGQ7AeJXr3ArM R5uziuv8iqtw6bziJv2Il+7XGhCrpyGID8PLv+r2zmOo0rVdWFn0NLcDm1WyO6uRHO6x WUwA== Received: by 10.229.179.231 with SMTP id br39mr2006851qcb.123.1353219921745; Sat, 17 Nov 2012 22:25:21 -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.20 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 17 Nov 2012 22:25:21 -0800 (PST) From: Xi Wang To: Krzysztof Halasa Cc: netdev@vger.kernel.org, Xi Wang , Andrew Morton Subject: [PATCH RFC 1/2] ixp4xx_eth: avoid calling dma_pool_create() with NULL dev Date: Sun, 18 Nov 2012 01:25:09 -0500 Message-Id: <1353219910-24690-1-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.7.10.4 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/ethernet/xscale/ixp4xx_eth.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index 98934bd..477d672 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1102,10 +1102,12 @@ static int init_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)))