From patchwork Thu Nov 5 15:25:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 37793 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 C6080B7BAC for ; Fri, 6 Nov 2009 04:57:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757851AbZKER4Z (ORCPT ); Thu, 5 Nov 2009 12:56:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758037AbZKER4M (ORCPT ); Thu, 5 Nov 2009 12:56:12 -0500 Received: from eddie.linux-mips.org ([78.24.191.182]:45221 "EHLO eddie.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757811AbZKERzm (ORCPT ); Thu, 5 Nov 2009 12:55:42 -0500 Received: from localhost.localdomain ([127.0.0.1]:58930 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1493059AbZKERzq (ORCPT + 1 other); Thu, 5 Nov 2009 18:55:46 +0100 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id nA5Hv7bx024941; Thu, 5 Nov 2009 18:57:07 +0100 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id nA5Hv7gg024940; Thu, 5 Nov 2009 18:57:07 +0100 Message-Id: <20091105152702.125802957@linux-mips.org> User-Agent: quilt/0.47-1 Date: Thu, 05 Nov 2009 16:25:58 +0100 From: Ralf Baechle To: Linus Torvalds Cc: David Daney , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, netdev@vger.kernel.org Subject: [PATCH 2/6] Staging: Octeon: Use symbolic values for irq numbers. References: <20091105152555.227009519@linux-mips.org> Content-Disposition: inline; filename=0003.patch Lines: 29 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Daney In addition to being magic numbers, the irq number passed to free_irq is incorrect. We need to use the correct symbolic value instead. Signed-off-by: David Daney Cc: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org Signed-off-by: Ralf Baechle drivers/staging/octeon/ethernet-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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 Index: upstream-linus/drivers/staging/octeon/ethernet-spi.c =================================================================== --- upstream-linus.orig/drivers/staging/octeon/ethernet-spi.c +++ upstream-linus/drivers/staging/octeon/ethernet-spi.c @@ -317,6 +317,6 @@ void cvm_oct_spi_uninit(struct net_devic cvmx_write_csr(CVMX_SPXX_INT_MSK(interface), 0); cvmx_write_csr(CVMX_STXX_INT_MSK(interface), 0); } - free_irq(8 + 46, &number_spi_ports); + free_irq(OCTEON_IRQ_RML, &number_spi_ports); } }