projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc4' into next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
parisc
/
lasi.c
diff --git
a/drivers/parisc/lasi.c
b/drivers/parisc/lasi.c
index cb3d281761293f82eb5e7fbeec1e26d28d7bc473..e65727ca9fc070ed2233289a33498b403d3e229c 100644
(file)
--- a/
drivers/parisc/lasi.c
+++ b/
drivers/parisc/lasi.c
@@
-107,7
+107,7
@@
lasi_init_irq(struct gsc_asic *this_lasi)
#else
#else
-void __init lasi_led_init(unsigned long lasi_hpa)
+
static
void __init lasi_led_init(unsigned long lasi_hpa)
{
unsigned long datareg;
{
unsigned long datareg;
@@
-163,8
+163,7
@@
static void lasi_power_off(void)
gsc_writel(0x02, datareg);
}
gsc_writel(0x02, datareg);
}
-int __init
-lasi_init_chip(struct parisc_device *dev)
+static int __init lasi_init_chip(struct parisc_device *dev)
{
extern void (*chassis_power_off)(void);
struct gsc_asic *lasi;
{
extern void (*chassis_power_off)(void);
struct gsc_asic *lasi;
@@
-193,7
+192,7
@@
lasi_init_chip(struct parisc_device *dev)
dev->irq = gsc_alloc_irq(&gsc_irq);
if (dev->irq < 0) {
printk(KERN_ERR "%s(): cannot get GSC irq\n",
dev->irq = gsc_alloc_irq(&gsc_irq);
if (dev->irq < 0) {
printk(KERN_ERR "%s(): cannot get GSC irq\n",
- __
FUNCTION
__);
+ __
func
__);
kfree(lasi);
return -EBUSY;
}
kfree(lasi);
return -EBUSY;
}