Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Finally remove leftover markers sections m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC m68k/mac: Fix compiler warning in via_read_time() zorro: Fix four checkpatch warnings
This commit is contained in:
commit
cd85b55741
|
@ -77,7 +77,6 @@ SECTIONS {
|
||||||
|
|
||||||
*(.rodata) *(.rodata.*)
|
*(.rodata) *(.rodata.*)
|
||||||
*(__vermagic) /* Kernel version magic */
|
*(__vermagic) /* Kernel version magic */
|
||||||
*(__markers_strings)
|
|
||||||
*(.rodata1)
|
*(.rodata1)
|
||||||
*(.rodata.str1.1)
|
*(.rodata.str1.1)
|
||||||
|
|
||||||
|
|
|
@ -370,7 +370,7 @@ int mac_irq_pending(unsigned int irq)
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
if (psc_present)
|
if (psc_present)
|
||||||
psc_irq_pending(irq);
|
return psc_irq_pending(irq);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -304,35 +304,41 @@ static void via_write_pram(int offset, __u8 data)
|
||||||
static long via_read_time(void)
|
static long via_read_time(void)
|
||||||
{
|
{
|
||||||
union {
|
union {
|
||||||
__u8 cdata[4];
|
__u8 cdata[4];
|
||||||
long idata;
|
long idata;
|
||||||
} result, last_result;
|
} result, last_result;
|
||||||
int ct;
|
int count = 1;
|
||||||
|
|
||||||
|
via_pram_command(0x81, &last_result.cdata[3]);
|
||||||
|
via_pram_command(0x85, &last_result.cdata[2]);
|
||||||
|
via_pram_command(0x89, &last_result.cdata[1]);
|
||||||
|
via_pram_command(0x8D, &last_result.cdata[0]);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The NetBSD guys say to loop until you get the same reading
|
* The NetBSD guys say to loop until you get the same reading
|
||||||
* twice in a row.
|
* twice in a row.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ct = 0;
|
while (1) {
|
||||||
do {
|
|
||||||
if (++ct > 10) {
|
|
||||||
printk("via_read_time: couldn't get valid time, "
|
|
||||||
"last read = 0x%08lx and 0x%08lx\n",
|
|
||||||
last_result.idata, result.idata);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
last_result.idata = result.idata;
|
|
||||||
result.idata = 0;
|
|
||||||
|
|
||||||
via_pram_command(0x81, &result.cdata[3]);
|
via_pram_command(0x81, &result.cdata[3]);
|
||||||
via_pram_command(0x85, &result.cdata[2]);
|
via_pram_command(0x85, &result.cdata[2]);
|
||||||
via_pram_command(0x89, &result.cdata[1]);
|
via_pram_command(0x89, &result.cdata[1]);
|
||||||
via_pram_command(0x8D, &result.cdata[0]);
|
via_pram_command(0x8D, &result.cdata[0]);
|
||||||
} while (result.idata != last_result.idata);
|
|
||||||
|
|
||||||
return result.idata - RTC_OFFSET;
|
if (result.idata == last_result.idata)
|
||||||
|
return result.idata - RTC_OFFSET;
|
||||||
|
|
||||||
|
if (++count > 10)
|
||||||
|
break;
|
||||||
|
|
||||||
|
last_result.idata = result.idata;
|
||||||
|
}
|
||||||
|
|
||||||
|
pr_err("via_read_time: failed to read a stable value; "
|
||||||
|
"got 0x%08lx then 0x%08lx\n",
|
||||||
|
last_result.idata, result.idata);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -37,6 +37,7 @@ zorro_match_device(const struct zorro_device_id *ids,
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(zorro_match_device);
|
||||||
|
|
||||||
|
|
||||||
static int zorro_device_probe(struct device *dev)
|
static int zorro_device_probe(struct device *dev)
|
||||||
|
@ -91,6 +92,7 @@ int zorro_register_driver(struct zorro_driver *drv)
|
||||||
/* register with core */
|
/* register with core */
|
||||||
return driver_register(&drv->driver);
|
return driver_register(&drv->driver);
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(zorro_register_driver);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -107,6 +109,7 @@ void zorro_unregister_driver(struct zorro_driver *drv)
|
||||||
{
|
{
|
||||||
driver_unregister(&drv->driver);
|
driver_unregister(&drv->driver);
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(zorro_unregister_driver);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -168,6 +171,7 @@ struct bus_type zorro_bus_type = {
|
||||||
.probe = zorro_device_probe,
|
.probe = zorro_device_probe,
|
||||||
.remove = zorro_device_remove,
|
.remove = zorro_device_remove,
|
||||||
};
|
};
|
||||||
|
EXPORT_SYMBOL(zorro_bus_type);
|
||||||
|
|
||||||
|
|
||||||
static int __init zorro_driver_init(void)
|
static int __init zorro_driver_init(void)
|
||||||
|
@ -177,7 +181,3 @@ static int __init zorro_driver_init(void)
|
||||||
|
|
||||||
postcore_initcall(zorro_driver_init);
|
postcore_initcall(zorro_driver_init);
|
||||||
|
|
||||||
EXPORT_SYMBOL(zorro_match_device);
|
|
||||||
EXPORT_SYMBOL(zorro_register_driver);
|
|
||||||
EXPORT_SYMBOL(zorro_unregister_driver);
|
|
||||||
EXPORT_SYMBOL(zorro_bus_type);
|
|
||||||
|
|
|
@ -222,7 +222,6 @@
|
||||||
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
|
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
|
||||||
*(__tracepoints_ptrs) /* Tracepoints: pointer array */\
|
*(__tracepoints_ptrs) /* Tracepoints: pointer array */\
|
||||||
VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \
|
VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \
|
||||||
*(__markers_strings) /* Markers: strings */ \
|
|
||||||
*(__tracepoints_strings)/* Tracepoints: strings */ \
|
*(__tracepoints_strings)/* Tracepoints: strings */ \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
|
|
Reference in New Issue