Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Thu, 5 Nov 2009
 10:57:37 -0700
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id nA5Hvb7t024639	for
 <andy.sharp@lsi.com>; Thu, 5 Nov 2009 09:57:37 -0800
Received: from psmtp.com (na3sys009amx254.postini.com [74.125.149.138])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id nA5HvZD3015978	for
 <andy.sharp@lsi.com>; Thu, 5 Nov 2009 09:57:35 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx254.postini.com
 ([74.125.148.14]) with SMTP;	Thu, 05 Nov 2009 09:57:36 PST
Received: from localhost.localdomain ([127.0.0.1]:46508 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1492856AbZKER5e (ORCPT <rfc822;andy.sharp@lsi.com>);	Thu, 5 Nov
 2009 18:57:34 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 05 Nov 2009 18:57:16
 +0100 (CET)
Received: from localhost.localdomain ([127.0.0.1]:58911 "EHLO h5.dl5rb.org.uk"
	rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP	id
 S1493001AbZKERzn (ORCPT <rfc822;linux-mips@linux-mips.org>);	Thu, 5 Nov 2009
 18:55:43 +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
From: Ralf Baechle <ralf@linux-mips.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
CC: David Daney <ddaney@caviumnetworks.com>, Greg Kroah-Hartman
	<gregkh@suse.de>, "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 5 Nov 2009 08:25:58 -0700
Subject: [PATCH 2/6] Staging: Octeon: Use symbolic values for irq numbers.
Thread-Topic: [PATCH 2/6] Staging: Octeon: Use symbolic values for irq
 numbers.
Thread-Index: AcpeQXXlEMoJJxZSSTuozSWPr65zEw==
Message-ID: <20091105152702.125802957@linux-mips.org>
References: <20091105152555.227009519@linux-mips.org>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:60.37072/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <ralf@linux-mips.org> [22/1] 
x-pstn-neptune: 0/0/0.00/0
user-agent: quilt/0.47-1
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

From: David Daney <ddaney@caviumnetworks.com>

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 <ddaney@caviumnetworks.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
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 <ralf@linux-mips.org>

 drivers/staging/octeon/ethernet-spi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: upstream-linus/drivers/staging/octeon/ethernet-spi.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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);
 	}
 }



