git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
macintosh
/
adb.c
diff --git
a/drivers/macintosh/adb.c
b/drivers/macintosh/adb.c
index
7297c77
..
360f93f
100644
(file)
--- a/
drivers/macintosh/adb.c
+++ b/
drivers/macintosh/adb.c
@@
-16,7
+16,6
@@
* - move bus probe to a kernel thread
*/
* - move bus probe to a kernel thread
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
@@
-36,12
+35,12
@@
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/device.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/device.h>
-#include <linux/devfs_fs_kernel.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
#ifdef CONFIG_PPC
#include <asm/prom.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
#ifdef CONFIG_PPC
#include <asm/prom.h>
+#include <asm/machdep.h>
#endif
#endif
@@
-77,10
+76,10
@@
static struct adb_driver *adb_driver_list[] = {
NULL
};
NULL
};
-static struct class
_simple
*adb_dev_class;
+static struct class *adb_dev_class;
struct adb_driver *adb_controller;
struct adb_driver *adb_controller;
-
struct notifier_block *adb_client_list = NULL
;
+
BLOCKING_NOTIFIER_HEAD(adb_client_list)
;
static int adb_got_sleep;
static int adb_inited;
static pid_t adb_probe_task_pid;
static int adb_got_sleep;
static int adb_inited;
static pid_t adb_probe_task_pid;
@@
-90,7
+89,7
@@
static int sleepy_trackpad;
static int autopoll_devs;
int __adb_probe_sync;
static int autopoll_devs;
int __adb_probe_sync;
-#ifdef CONFIG_PM
AC_PBOOK
+#ifdef CONFIG_PM
static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
static struct pmu_sleep_notifier adb_sleep_notifier = {
adb_notify_sleep,
static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
static struct pmu_sleep_notifier adb_sleep_notifier = {
adb_notify_sleep,
@@
-294,7
+293,7
@@
int __init adb_init(void)
int i;
#ifdef CONFIG_PPC32
int i;
#ifdef CONFIG_PPC32
- if (
(_machine != _MACH_chrp) && (_machine != _MACH_Pmac)
)
+ if (
!machine_is(chrp) && !machine_is(powermac)
)
return 0;
#endif
#ifdef CONFIG_MAC
return 0;
#endif
#ifdef CONFIG_MAC
@@
-320,9
+319,9
@@
int __init adb_init(void)
printk(KERN_WARNING "Warning: no ADB interface detected\n");
adb_controller = NULL;
} else {
printk(KERN_WARNING "Warning: no ADB interface detected\n");
adb_controller = NULL;
} else {
-#ifdef CONFIG_PM
AC_PBOOK
+#ifdef CONFIG_PM
pmu_register_sleep_notifier(&adb_sleep_notifier);
pmu_register_sleep_notifier(&adb_sleep_notifier);
-#endif /* CONFIG_PM
AC_PBOOK
*/
+#endif /* CONFIG_PM */
#ifdef CONFIG_PPC
if (machine_is_compatible("AAPL,PowerBook1998") ||
machine_is_compatible("PowerBook1,1"))
#ifdef CONFIG_PPC
if (machine_is_compatible("AAPL,PowerBook1998") ||
machine_is_compatible("PowerBook1,1"))
@@
-337,7
+336,7
@@
int __init adb_init(void)
__initcall(adb_init);
__initcall(adb_init);
-#ifdef CONFIG_PM
AC_PBOOK
+#ifdef CONFIG_PM
/*
* notify clients before sleep and reset bus afterwards
*/
/*
* notify clients before sleep and reset bus afterwards
*/
@@
-354,7
+353,8
@@
adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
/* Stop autopoll */
if (adb_controller->autopoll)
adb_controller->autopoll(0);
/* Stop autopoll */
if (adb_controller->autopoll)
adb_controller->autopoll(0);
- ret = notifier_call_chain(&adb_client_list, ADB_MSG_POWERDOWN, NULL);
+ ret = blocking_notifier_call_chain(&adb_client_list,
+ ADB_MSG_POWERDOWN, NULL);
if (ret & NOTIFY_STOP_MASK) {
up(&adb_probe_mutex);
return PBOOK_SLEEP_REFUSE;
if (ret & NOTIFY_STOP_MASK) {
up(&adb_probe_mutex);
return PBOOK_SLEEP_REFUSE;
@@
-378,7
+378,7
@@
adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
}
return PBOOK_SLEEP_OK;
}
}
return PBOOK_SLEEP_OK;
}
-#endif /* CONFIG_PM
AC_PBOOK
*/
+#endif /* CONFIG_PM */
static int
do_adb_reset_bus(void)
static int
do_adb_reset_bus(void)
@@
-391,7
+391,8
@@
do_adb_reset_bus(void)
if (adb_controller->autopoll)
adb_controller->autopoll(0);
if (adb_controller->autopoll)
adb_controller->autopoll(0);
- nret = notifier_call_chain(&adb_client_list, ADB_MSG_PRE_RESET, NULL);
+ nret = blocking_notifier_call_chain(&adb_client_list,
+ ADB_MSG_PRE_RESET, NULL);
if (nret & NOTIFY_STOP_MASK) {
if (adb_controller->autopoll)
adb_controller->autopoll(autopoll_devs);
if (nret & NOTIFY_STOP_MASK) {
if (adb_controller->autopoll)
adb_controller->autopoll(autopoll_devs);
@@
-426,7
+427,8
@@
do_adb_reset_bus(void)
}
up(&adb_handler_sem);
}
up(&adb_handler_sem);
- nret = notifier_call_chain(&adb_client_list, ADB_MSG_POST_RESET, NULL);
+ nret = blocking_notifier_call_chain(&adb_client_list,
+ ADB_MSG_POST_RESET, NULL);
if (nret & NOTIFY_STOP_MASK)
return -EBUSY;
if (nret & NOTIFY_STOP_MASK)
return -EBUSY;
@@
-900,11
+902,8
@@
adbdev_init(void)
return;
}
return;
}
- devfs_mk_cdev(MKDEV(ADB_MAJOR, 0), S_IFCHR | S_IRUSR | S_IWUSR, "adb");
-
- adb_dev_class = class_simple_create(THIS_MODULE, "adb");
- if (IS_ERR(adb_dev_class)) {
+ adb_dev_class = class_create(THIS_MODULE, "adb");
+ if (IS_ERR(adb_dev_class))
return;
return;
- }
- class_simple_device_add(adb_dev_class, MKDEV(ADB_MAJOR, 0), NULL, "adb");
+ class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
}
}