From patchwork Tue Jul 10 00:09:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 169990 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 9A4F72C0205 for ; Tue, 10 Jul 2012 10:09:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755190Ab2GJAJ1 (ORCPT ); Mon, 9 Jul 2012 20:09:27 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56424 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755180Ab2GJAJY (ORCPT ); Mon, 9 Jul 2012 20:09:24 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so20018595pbb.19 for ; Mon, 09 Jul 2012 17:09:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=V8sBit9PgB2MNoIn04g++jKfBybgzTKpktNsiTJrp10=; b=J+k1RzTiw1xnfxieHVPSNSA3cne9pyd+qpT7cggOUFudJJvYcDybLa+iserqyyg4SF FBC2YdznU08roQtiNxTLdY8nu75Kq48ZgiKZ5zWqkAURxum1nZ864FECCZW2WlgFlA1e 37HqsTLy8psUzgXsk5YbeDFBBvJ15QxgxvDbIJfAl99X9tI7xoUnQUjOijPUQ59WcFLo EgDVhlh8ANJPR4EjpOE7QxAKHIqImDqwk6i7ikdw0alZw0ldixO1veWNrAg9pFEYtYZI bYpphGU54QM938EPJ87NQINDdpwZfTPB8ruLVuoyl+nlAvT2mZJZSm3/cngI6Ys94HlS IbNA== Received: by 10.68.116.203 with SMTP id jy11mr62700497pbb.129.1341878963713; Mon, 09 Jul 2012 17:09:23 -0700 (PDT) Received: from scylla (184-98-21-173.phnx.qwest.net. [184.98.21.173]) by mx.google.com with ESMTPS id ka5sm28641913pbb.37.2012.07.09.17.09.20 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 17:09:22 -0700 (PDT) Received: by scylla (sSMTP sendmail emulation); Mon, 09 Jul 2012 17:09:55 -0700 From: Jon Mason To: "David S. Miller" Cc: netdev@vger.kernel.org Subject: [PATCH 05/11] ksz884x: remove unnecessary setting of skb->dev Date: Mon, 9 Jul 2012 17:09:29 -0700 Message-Id: <1341878975-10577-5-git-send-email-jdmason@kudzu.us> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341878975-10577-1-git-send-email-jdmason@kudzu.us> References: <1341878975-10577-1-git-send-email-jdmason@kudzu.us> X-Gm-Message-State: ALoCoQlmvP7gLgdavyEAfyngPNFL9h4is1GkqIqnUae+Ch2xcs7jqe4l+bYYsDK+M1mtAEG+4dlI Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb->dev is being unnecessarily set during ring init. It is already being set to the proper value when eth_type_trans is called on packet receive, and the skb->dev is not referenced anywhere else in the code. Signed-off-by: Jon Mason --- drivers/net/ethernet/micrel/ksz884x.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index eaf9ff0..2b59e39 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -4480,14 +4480,12 @@ static void ksz_init_rx_buffers(struct dev_info *adapter) dma_buf->len = adapter->mtu; if (!dma_buf->skb) dma_buf->skb = alloc_skb(dma_buf->len, GFP_ATOMIC); - if (dma_buf->skb && !dma_buf->dma) { - dma_buf->skb->dev = adapter->dev; + if (dma_buf->skb && !dma_buf->dma) dma_buf->dma = pci_map_single( adapter->pdev, skb_tail_pointer(dma_buf->skb), dma_buf->len, PCI_DMA_FROMDEVICE); - } /* Set descriptor. */ set_rx_buf(desc, dma_buf->dma);