projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[platform/kernel/linux-starfive.git]
/
drivers
/
serial
/
sunhv.c
diff --git
a/drivers/serial/sunhv.c
b/drivers/serial/sunhv.c
index
890f917
..
a779e22
100644
(file)
--- a/
drivers/serial/sunhv.c
+++ b/
drivers/serial/sunhv.c
@@
-525,7
+525,7
@@
static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
unsigned long minor;
int err;
unsigned long minor;
int err;
- if (op->irqs[0] == 0xffffffff)
+ if (op->
archdata.
irqs[0] == 0xffffffff)
return -ENODEV;
port = kzalloc(sizeof(struct uart_port), GFP_KERNEL);
return -ENODEV;
port = kzalloc(sizeof(struct uart_port), GFP_KERNEL);
@@
-557,7
+557,7
@@
static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
port->membase = (unsigned char __iomem *) __pa(port);
port->membase = (unsigned char __iomem *) __pa(port);
- port->irq = op->irqs[0];
+ port->irq = op->
archdata.
irqs[0];
port->dev = &op->dev;
port->dev = &op->dev;
@@
-644,12
+644,12
@@
static int __init sunhv_init(void)
if (tlb_type != hypervisor)
return -ENODEV;
if (tlb_type != hypervisor)
return -ENODEV;
- return of_register_
driver(&hv_driver, &of_bus_type
);
+ return of_register_
platform_driver(&hv_driver
);
}
static void __exit sunhv_exit(void)
{
}
static void __exit sunhv_exit(void)
{
- of_unregister_driver(&hv_driver);
+ of_unregister_
platform_
driver(&hv_driver);
}
module_init(sunhv_init);
}
module_init(sunhv_init);