git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make drivers/net/s2io.c:vlan_strip_flag static
[safe/jmp/linux-2.6]
/
drivers
/
macintosh
/
apm_emu.c
diff --git
a/drivers/macintosh/apm_emu.c
b/drivers/macintosh/apm_emu.c
index
e5a2bbf
..
c5e4d43
100644
(file)
--- a/
drivers/macintosh/apm_emu.c
+++ b/
drivers/macintosh/apm_emu.c
@@
-18,7
+18,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/poll.h>
@@
-103,7
+102,7
@@
static struct pmu_sleep_notifier apm_sleep_notifier = {
SLEEP_LEVEL_USERLAND,
};
SLEEP_LEVEL_USERLAND,
};
-static c
har driver_version[] = "0.5";
/* no spaces */
+static c
onst char driver_version[] = "0.5";
/* no spaces */
#ifdef DEBUG
static char * apm_event_name[] = {
#ifdef DEBUG
static char * apm_event_name[] = {
@@
-322,7
+321,7
@@
static int do_open(struct inode * inode, struct file * filp)
{
struct apm_user * as;
{
struct apm_user * as;
- as =
(struct apm_user *)
kmalloc(sizeof(*as), GFP_KERNEL);
+ as = kmalloc(sizeof(*as), GFP_KERNEL);
if (as == NULL) {
printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
sizeof(*as));
if (as == NULL) {
printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
sizeof(*as));
@@
-502,7
+501,7
@@
static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
return p - buf;
}
return p - buf;
}
-static struct file_operations apm_bios_fops = {
+static
const
struct file_operations apm_bios_fops = {
.owner = THIS_MODULE,
.read = do_read,
.poll = do_poll,
.owner = THIS_MODULE,
.read = do_read,
.poll = do_poll,
@@
-530,7
+529,8
@@
static int __init apm_emu_init(void)
if (apm_proc)
apm_proc->owner = THIS_MODULE;
if (apm_proc)
apm_proc->owner = THIS_MODULE;
- misc_register(&apm_device);
+ if (misc_register(&apm_device) != 0)
+ printk(KERN_INFO "Could not create misc. device for apm\n");
pmu_register_sleep_notifier(&apm_sleep_notifier);
pmu_register_sleep_notifier(&apm_sleep_notifier);