The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: wanlong.gao@gmail.com
To: hans-christian.egtvedt@atmel.com, chris@zankel.net,
	steiner@sgi.com, tglx@linutronix.de, akpm@linux-foundation.org,
	hch@lst.de
Cc: linux-kernel@vger.kernel.org, Wanlong Gao <wanlong.gao@gmail.com>
Subject: [PATCH 3/3] fix the wrong members of gru_chip
Date: Sun, 10 Apr 2011 14:14:44 +0800	[thread overview]
Message-ID: <1302416084-13372-3-git-send-email-wanlong.gao@gmail.com> (raw)
In-Reply-To: <1302416084-13372-1-git-send-email-wanlong.gao@gmail.com>

From: Wanlong Gao <wanlong.gao@gmail.com>

Fix the wrong members and the wrong function's definition,
since the irq_chip had changed .

Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com>
---
 drivers/misc/sgi-gru/grufile.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 20e4e93..ecafa4b
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -348,15 +348,15 @@ static unsigned long gru_chiplet_cpu_to_mmr(int chiplet, int cpu, int *corep)
 
 static int gru_irq_count[GRU_CHIPLETS_PER_BLADE];
 
-static void gru_noop(unsigned int irq)
+static void gru_noop(struct irq_data *d)
 {
 }
 
 static struct irq_chip gru_chip[GRU_CHIPLETS_PER_BLADE] = {
 	[0 ... GRU_CHIPLETS_PER_BLADE - 1] {
-		.mask		= gru_noop,
-		.unmask		= gru_noop,
-		.ack		= gru_noop
+		.irq_mask	= gru_noop,
+		.irq_unmask	= gru_noop,
+		.irq_ack	= gru_noop
 	}
 };
 
-- 
1.7.3


      parent reply	other threads:[~2011-04-10  6:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-10  6:14 [PATCH 1/3] fix the argument error of irq_chip's members wanlong.gao
2011-04-10  6:14 ` [PATCH 2/3] fix the wrong argument of the functions definition wanlong.gao
2011-04-13 13:14   ` Hans-Christian Egtvedt
2011-04-13 13:18     ` Wanlong Gao
2011-04-10  6:14 ` wanlong.gao [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1302416084-13372-3-git-send-email-wanlong.gao@gmail.com \
    --to=wanlong.gao@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=chris@zankel.net \
    --cc=hans-christian.egtvedt@atmel.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=steiner@sgi.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox