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, 3 Sep 2009
 17:12:24 -0600
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id n83NCISf024947	for
 <andy.sharp@lsi.com>; Thu, 3 Sep 2009 16:12:20 -0700
Received: from psmtp.com (exprod7mx178.postini.com [64.18.2.136])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id n83N8xQ5029543	for
 <andy.sharp@lsi.com>; Thu, 3 Sep 2009 16:09:04 -0700 (PDT)
Received: from source ([78.24.191.182]) by exprod7mx178.postini.com
 ([64.18.6.14]) with SMTP;	Thu, 03 Sep 2009 18:12:17 CDT
Received: from localhost.localdomain ([127.0.0.1]:37575 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1493183AbZICXLj (ORCPT <rfc822;andy.sharp@lsi.com>);	Fri, 4 Sep
 2009 01:11:39 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 Sep 2009 01:11:22
 +0200 (CEST)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:41292 "EHLO
	mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)	by ftp.linux-mips.org with
 ESMTP id S1493207AbZICXLQ (ORCPT	<rfc822;linux-mips@linux-mips.org>); Fri, 4
 Sep 2009 01:11:16 +0200
Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by
 mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503)	id <B4aa04cfb0000>;
 Thu, 03 Sep 2009 19:10:51 -0400
Received: from caexch01.caveonetworks.com ([192.168.16.9]) by
 caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Thu, 3 Sep
 2009 16:10:54 -0700
Received: from dd1.caveonetworks.com ([64.169.86.201]) by
 caexch01.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);	 Thu, 3 Sep 2009 16:10:54 -0700
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n83NAnp4003116;	Thu, 3
 Sep 2009 16:10:50 -0700
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id n83NAls8003115;	Thu, 3 Sep 2009 16:10:47 -0700
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>, "gregkh@suse.de"
	<gregkh@suse.de>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 3 Sep 2009 17:10:47 -0600
Subject: [PATCH] Staging: Octeon: Use symbolic values for irq numbers.
Thread-Topic: [PATCH] Staging: Octeon: Use symbolic values for irq numbers.
Thread-Index: Acos7AAucVmPql1FSGCVZN/DTbBHOA==
Message-ID: <1252019447-3090-1-git-send-email-ddaney@caviumnetworks.com>
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-originalarrivaltime: 03 Sep 2009 23:10:54.0871 (UTC)
 FILETIME=[C9D6BA70:01CA2CEB]
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-neptune: 2/1/0.50/59
x-pstn-levels: (S:49.29771/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 <ddaney@caviumnetworks.com> [db-null] 
x-archive-position: 23983
x-ecartis-version: Ecartis v1.0.0
x-original-sender: ddaney@caviumnetworks.com
x-list: linux-mips
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

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>
---

Octeon being a member of the mips archecture, this could merge via
Ralf's linux-mips.org tree.

 drivers/staging/octeon/ethernet-spi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon=
/ethernet-spi.c
index 66190b0..00dc0f4 100644
--- a/drivers/staging/octeon/ethernet-spi.c
+++ b/drivers/staging/octeon/ethernet-spi.c
@@ -317,6 +317,6 @@ void cvm_oct_spi_uninit(struct net_device *dev)
 			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);
 	}
 }
--=20
1.6.0.6


