projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Char: sx, use pci_iomap
[powerpc.git]
/
drivers
/
char
/
snsc.c
diff --git
a/drivers/char/snsc.c
b/drivers/char/snsc.c
index
203240b
..
52753e7
100644
(file)
--- a/
drivers/char/snsc.c
+++ b/
drivers/char/snsc.c
@@
-34,7
+34,7
@@
#define SCDRV_TIMEOUT 1000
static irqreturn_t
#define SCDRV_TIMEOUT 1000
static irqreturn_t
-scdrv_interrupt(int irq, void *subch_data
, struct pt_regs *regs
)
+scdrv_interrupt(int irq, void *subch_data)
{
struct subch_data_s *sd = subch_data;
unsigned long flags;
{
struct subch_data_s *sd = subch_data;
unsigned long flags;
@@
-347,7
+347,7
@@
scdrv_poll(struct file *file, struct poll_table_struct *wait)
return mask;
}
return mask;
}
-static struct file_operations scdrv_fops = {
+static
const
struct file_operations scdrv_fops = {
.owner = THIS_MODULE,
.read = scdrv_read,
.write = scdrv_write,
.owner = THIS_MODULE,
.read = scdrv_read,
.write = scdrv_write,
@@
-374,7
+374,12
@@
scdrv_init(void)
struct sysctl_data_s *scd;
void *salbuf;
dev_t first_dev, dev;
struct sysctl_data_s *scd;
void *salbuf;
dev_t first_dev, dev;
- nasid_t event_nasid = ia64_sn_get_console_nasid();
+ nasid_t event_nasid;
+
+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
+ event_nasid = ia64_sn_get_console_nasid();
if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
SYSCTL_BASENAME) < 0) {
if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
SYSCTL_BASENAME) < 0) {