properly create kobjects in acpi/scan.c

diff -Nru a/drivers/acpi/ac.c b/drivers/acpi/ac.c
@@ -29,7 +29,9 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_event.h>
 #include <acpi/acpi_drivers.h>
 
 

@@ -220,7 +222,7 @@
 	switch (event) {
 	case ACPI_AC_NOTIFY_STATUS:
 		acpi_ac_get_state(ac);
-		acpi_bus_generate_event(device, event, (u32) ac->state);
+		acpi_generate_event(device, event, (u32) ac->state);
 		break;
 	default:
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

diff -Nru a/drivers/acpi/acpi_ksyms.c b/drivers/acpi/acpi_ksyms.c
@@ -27,6 +27,7 @@
 #include <linux/acpi.h>
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_event.h>
 
 
 #ifdef CONFIG_ACPI_INTERPRETER

@@ -120,10 +121,11 @@
 #endif /*CONFIG_ACPI_INTERPRETER*/
 
 
-/* ACPI Bus Driver (acpi_bus.c) */
+/* ACPI Bus Driver */
 
 #ifdef CONFIG_ACPI_BUS
 
+/* bus.c */
 EXPORT_SYMBOL(acpi_fadt);
 EXPORT_SYMBOL(acpi_walk_namespace);
 EXPORT_SYMBOL(acpi_root_dir);

@@ -131,10 +133,11 @@
 EXPORT_SYMBOL(acpi_bus_get_status);
 EXPORT_SYMBOL(acpi_bus_get_power);
 EXPORT_SYMBOL(acpi_bus_set_power);
-EXPORT_SYMBOL(acpi_bus_generate_event);
-EXPORT_SYMBOL(acpi_bus_receive_event);
 EXPORT_SYMBOL(acpi_bus_register_driver);
 EXPORT_SYMBOL(acpi_bus_unregister_driver);
+
+/* event.c */
+EXPORT_SYMBOL(acpi_generate_event);
 
 #endif /*CONFIG_ACPI_BUS*/
 

diff -Nru a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
@@ -40,6 +40,7 @@
 #include <linux/proc_fs.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_event.h>
 #include <asm/uaccess.h>
 
 #define ASUS_ACPI_VERSION "0.28"

@@ -949,8 +950,8 @@
 		hotk->brightness = (event & ~((u32) BR_DOWN));
 	}
 
-	acpi_bus_generate_event(hotk->device, event,
-				hotk->event_count[event % 128]++);
+	acpi_generate_event(hotk->device, event,
+			    hotk->event_count[event % 128]++);
 
 	return;
 }

diff -Nru a/drivers/acpi/battery.c b/drivers/acpi/battery.c
@@ -31,6 +31,7 @@
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_event.h>
 #include <acpi/acpi_drivers.h>
 
 

@@ -719,7 +720,7 @@
 	case ACPI_BATTERY_NOTIFY_STATUS:
 	case ACPI_BATTERY_NOTIFY_INFO:
 		acpi_battery_check(battery);
-		acpi_bus_generate_event(device, event, battery->flags.present);
+		acpi_generate_event(device, event, battery->flags.present);
 		break;
 	default:
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

100 lines not on this page · raw message

diff -Nru a/drivers/acpi/button.c b/drivers/acpi/button.c
@@ -29,7 +29,9 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_event.h>
 #include <acpi/acpi_drivers.h>
 
 

@@ -290,7 +292,7 @@
 
 	switch (event) {
 	case ACPI_BUTTON_NOTIFY_STATUS:
-		acpi_bus_generate_event(button->device, event, ++button->pushed);
+		acpi_generate_event(button->device, event, ++button->pushed);
 		break;
 	default:
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

212 lines not on this page · raw message

diff -Nru a/drivers/acpi/processor.c b/drivers/acpi/processor.c
@@ -50,6 +50,7 @@
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <acpi/acpi_event.h>
 #include <acpi/processor.h>
 
 

@@ -2312,12 +2313,12 @@
 	switch (event) {
 	case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:
 		acpi_processor_ppc_has_changed(pr);
-		acpi_bus_generate_event(device, event, 
-			pr->performance_platform_limit);
+		acpi_generate_event(device, event,
+				    pr->performance_platform_limit);
 		break;
 	case ACPI_PROCESSOR_NOTIFY_POWER:
 		/* TBD */
-		acpi_bus_generate_event(device, event, 0);
+		acpi_generate_event(device, event, 0);
 		break;
 	default:
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

diff -Nru a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
@@ -42,6 +42,7 @@
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_event.h>
 #include <acpi/acpi_drivers.h>
 
 #define ACPI_THERMAL_COMPONENT		0x04000000

@@ -469,7 +470,7 @@
 		return_VALUE(result);
 
 	printk(KERN_EMERG "Critical temperature reached (%ld C), shutting down.\n", KELVIN_TO_CELSIUS(tz->temperature));
-	acpi_bus_generate_event(device, ACPI_THERMAL_NOTIFY_CRITICAL, tz->trips.critical.flags.enabled);
+	acpi_generate_event(device, ACPI_THERMAL_NOTIFY_CRITICAL, tz->trips.critical.flags.enabled);
 
 	acpi_thermal_call_usermode(ACPI_THERMAL_PATH_POWEROFF);
 

@@ -500,7 +501,7 @@
 	if (result)
 		return_VALUE(result);
 
-	acpi_bus_generate_event(device, ACPI_THERMAL_NOTIFY_HOT, tz->trips.hot.flags.enabled);
+	acpi_generate_event(device, ACPI_THERMAL_NOTIFY_HOT, tz->trips.hot.flags.enabled);
 
 	/* TBD: Call user-mode "sleep(S4)" function */
 

@@ -1199,12 +1200,12 @@
 	case ACPI_THERMAL_NOTIFY_THRESHOLDS:
 		acpi_thermal_get_trip_points(tz);
 		acpi_thermal_check(tz);
-		acpi_bus_generate_event(device, event, 0);
+		acpi_generate_event(device, event, 0);
 		break;
 	case ACPI_THERMAL_NOTIFY_DEVICES:
 		if (tz->flags.devices)
 			acpi_thermal_get_devices(tz);
-		acpi_bus_generate_event(device, event, 0);
+		acpi_generate_event(device, event, 0);
 		break;
 	default:
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

diff -Nru a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
@@ -293,20 +293,6 @@
 
 #define acpi_driver_data(d)	((d)->driver_data)
 
-
-/*
- * Events
- * ------
- */
-
-struct acpi_bus_event {
-	struct list_head	node;
-	acpi_device_class	device_class;
-	acpi_bus_id		bus_id;
-	u32			type;
-	u32			data;
-};
-
 extern struct subsystem acpi_subsys;
 
 /*

@@ -317,8 +303,6 @@
 int acpi_bus_get_status (struct acpi_device *device);
 int acpi_bus_get_power (acpi_handle handle, int *state);
 int acpi_bus_set_power (acpi_handle handle, int state);
-int acpi_bus_generate_event (struct acpi_device *device, u8 type, int data);
-int acpi_bus_receive_event (struct acpi_bus_event *event);
 int acpi_bus_register_driver (struct acpi_driver *driver);
 int acpi_bus_unregister_driver (struct acpi_driver *driver);
 

47 lines not on this page · raw message

diff -Nru a/drivers/acpi/bus.c b/drivers/acpi/bus.c
@@ -27,7 +27,6 @@
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
-#include <linux/device.h>
 #include <linux/proc_fs.h>
 #ifdef CONFIG_X86
 #include <asm/mpspec.h>

@@ -629,8 +628,6 @@
 	return_VALUE(-ENODEV);
 }
 
-decl_subsys(acpi,NULL,NULL);
-
 static int __init acpi_init (void)
 {
 	int			result = 0;

@@ -648,10 +645,7 @@
 		return -ENODEV;
 	}
 
-	firmware_register(&acpi_subsys);
-
 	result = acpi_bus_init();
-
 	if (!result) {
 #ifdef CONFIG_PM
 		if (!PM_IS_ACTIVE())

272 lines not on this page · raw message

diff -Nru a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
@@ -89,9 +89,9 @@
 			return error;
 	}
 
+	acpi_enable_wakeup_device(acpi_state);
 
 	local_irq_save(flags);
-	acpi_enable_wakeup_device(acpi_state);
 	switch (pm_state)
 	{
 	case PM_SUSPEND_STANDBY:

diff -Nru a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
@@ -354,22 +354,20 @@
 }
 
 extern struct list_head	acpi_wakeup_device_list;
-extern spinlock_t acpi_device_lock;
 
 static int
 acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 {
-	struct list_head * node, * next;
+	struct acpi_device *dev;
 
 	seq_printf(seq, "Device	Sleep state	Status\n");
 
-	spin_lock(&acpi_device_lock);
-	list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-		struct acpi_device * dev = container_of(node, struct acpi_device, wakeup_list);
+	down_read(&acpi_subsys.rwsem);
+	list_for_each_entry(dev, &acpi_wakeup_device_list, wakeup_list) {
 
 		if (!dev->wakeup.flags.valid)
 			continue;
-		spin_unlock(&acpi_device_lock);
+
 		if (dev->wakeup.flags.run_wake)
 			seq_printf(seq, "%4s	%4d		%8s\n",
 				dev->pnp.bus_id, (u32) dev->wakeup.sleep_state,

@@ -378,9 +376,9 @@
 			seq_printf(seq, "%4s	%4d		%8s\n",
 				dev->pnp.bus_id, (u32) dev->wakeup.sleep_state,
 				dev->wakeup.state.enabled ? "enabled" : "disabled");
-		spin_lock(&acpi_device_lock);
 	}
-	spin_unlock(&acpi_device_lock);
+	up_read(&acpi_subsys.rwsem);
+
 	return 0;
 }
 

@@ -391,30 +389,32 @@
 	size_t			count,
 	loff_t			*ppos)
 {
-	struct list_head * node, * next;
-	char		strbuf[5];
-	char		str[5] = "";
-	int 		len = count;
+	struct acpi_device	*dev;
+	char			strbuf[5];
+	char			str[5] = "";
+	int 			len = count;
 
 	if (len > 4) len = 4;
 
 	if (copy_from_user(strbuf, buffer, len))
 		return -EFAULT;
+
 	strbuf[len] = '\0';
 	sscanf(strbuf, "%s", str);
 
-	spin_lock(&acpi_device_lock);
-	list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-		struct acpi_device * dev = container_of(node, struct acpi_device, wakeup_list);
+	down_write(&acpi_subsys.rwsem);
+	list_for_each_entry(dev, &acpi_wakeup_device_list, wakeup_list) {
+
 		if (!dev->wakeup.flags.valid)
 			continue;
 
 		if (!strncmp(dev->pnp.bus_id, str, 4)) {
-			dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0:1;
+			dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0 : 1;
 			break;
 		}
 	}
-	spin_unlock(&acpi_device_lock);
+	up_write(&acpi_subsys.rwsem);
+
 	return count;
 }
 

206 lines not on this page · raw message

diff -Nru a/drivers/acpi/event.c b/drivers/acpi/event.c
@@ -16,10 +16,20 @@
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME		("event")
 
+#define ACPI_EVENT_BUFFER_SIZE	64
+struct acpi_event_reader {
+	struct acpi_bus_event	buffer[ACPI_EVENT_BUFFER_SIZE];
+	int			head, tail;
+	char			str[ACPI_MAX_STRING];
+	int			chars_remaining;
+	char			*ptr;
+	struct list_head	node;
+};
+
 DECLARE_WAIT_QUEUE_HEAD(acpi_event_queue);
-LIST_HEAD(acpi_event_list);
+static LIST_HEAD(acpi_event_reader_list);
 static spinlock_t	acpi_event_lock = SPIN_LOCK_UNLOCKED;
-static int		event_is_open;
+static int		reader_count;
 
 int
 acpi_generate_event(

@@ -27,9 +37,9 @@
 	u8			type,
 	int			data)
 {
-	struct acpi_bus_event	*event;
-	unsigned long		flags;
-	int			result = 0;
+	struct acpi_bus_event		event;
+	struct acpi_event_reader	*reader;
+	unsigned long			flags;
 
 	ACPI_FUNCTION_TRACE("acpi_generate_event");
 

@@ -38,75 +48,66 @@
 
 	spin_lock_irqsave(&acpi_event_lock, flags);
 
-	/* drop event on the floor if no one's listening */
-	if (!event_is_open)
-		goto out;
-
-	event = kmalloc(sizeof(struct acpi_bus_event), GFP_ATOMIC);
-	if (!event) {
-		result = -ENOMEM;
-		goto out;
+	strcpy(event.device_class, device->pnp.device_class);
+	strcpy(event.bus_id, device->pnp.bus_id);
+	event.type = type;
+	event.data = data;
+
+	list_for_each_entry(reader, &acpi_event_reader_list, node) {
+		reader->buffer[reader->head] = event;
+		reader->head = (reader->head + 1) & (ACPI_EVENT_BUFFER_SIZE - 1);
 	}
+	spin_unlock_irqrestore(&acpi_event_lock, flags);
 
-	strcpy(event->device_class, device->pnp.device_class);
-	strcpy(event->bus_id, device->pnp.bus_id);
-	event->type = type;
-	event->data = data;
-
-	list_add_tail(&event->node, &acpi_event_list);
 	wake_up_interruptible(&acpi_event_queue);
 
-out:
-	spin_unlock_irqrestore(&acpi_event_lock, flags);
-	return_VALUE(result);
+	return_VALUE(0);
 }
 
-static struct acpi_bus_event *acpi_fetch_event(void)
+static void acpi_fetch_event(struct acpi_event_reader *reader)
 {
-	struct acpi_bus_event	*event = NULL;
+	struct acpi_bus_event	*event;
 	unsigned long		flags;
 
 	ACPI_FUNCTION_TRACE("acpi_fetch_event");
 
 	spin_lock_irqsave(&acpi_event_lock, flags);
 
-	if (!list_empty(&acpi_event_list)) {
-		event = list_entry(acpi_event_list.next,
-				   struct acpi_bus_event, node);
-		list_del(&event->node);
+	if (reader->head != reader->tail) {
+		event = &reader->buffer[reader->tail];
+		reader->tail = (reader->tail + 1) & (ACPI_EVENT_BUFFER_SIZE - 1);
+
+		reader->chars_remaining =
+			snprintf(reader->str, ACPI_MAX_STRING,
+				"%s %s %08x %08x\n",
+				event->device_class ?
+					event->device_class : "<unknown>",
+				event->bus_id ? event->bus_id : "<unknown>",
+				event->type, event->data);
+
 	}
 
 	spin_unlock_irqrestore(&acpi_event_lock, flags);
 
-	return_PTR(event);
+	return_VOID;
 }
 
 static int
 acpi_system_open_event(struct inode *inode, struct file *file)
 {
-	int rc = 0;
-
-	spin_lock_irq(&acpi_event_lock);
+	struct acpi_event_reader	*reader;
 
-	if (event_is_open) {
-		rc = -EBUSY;
-		goto out;
-	}
+	if (!(reader = kmalloc(sizeof(struct acpi_event_reader), GFP_KERNEL)))
+		return -ENOMEM;
 
-	event_is_open = 1;
+	memset(reader, 0, sizeof(struct acpi_event_reader));
+	file->private_data = reader;
 
-out:
+	spin_lock_irq(&acpi_event_lock);
+	list_add_tail(&reader->node, &acpi_event_reader_list);
+	reader_count++;
 	spin_unlock_irq(&acpi_event_lock);
-	return rc;
-}
-
-static inline int
-event_to_string(struct acpi_bus_event *event, char *buffer)
-{
-	return sprintf(buffer, "%s %s %08x %08x\n",
-		       event->device_class ? event->device_class : "<unknown>",
-		       event->bus_id ? event->bus_id : "<unknown>",
-		       event->type, event->data);
+	return 0;
 }
 
 static ssize_t

@@ -116,42 +117,33 @@
 	size_t			count,
 	loff_t			*ppos)
 {
-	int			result;
-	struct acpi_bus_event	*event;
-	static char		str[ACPI_MAX_STRING];
-	static int		chars_remaining;
-	static char		*ptr;
-
+	struct acpi_event_reader	*reader = file->private_data;
+	int				result;
 
 	ACPI_FUNCTION_TRACE("acpi_system_read_event");
 
-	if (!chars_remaining) {
-		if (list_empty(&acpi_event_list) &&
-		    (file->f_flags & O_NONBLOCK))
+	if (reader->chars_remaining == 0) {
+		if (reader->head == reader->tail && (file->f_flags & O_NONBLOCK))
 			return_VALUE(-EAGAIN);
 
 		result = wait_event_interruptible(acpi_event_queue,
-					!list_empty(&acpi_event_list));
+						  reader->head != reader->tail);
 		if (result)
 			return_VALUE(result);
 
-		if ((event = acpi_fetch_event()) == NULL)
-			return_VALUE(0);
-
-		chars_remaining = event_to_string(event, str);
-		ptr = str;
-		kfree(event);
+		acpi_fetch_event(reader);
+		reader->ptr = reader->str;
 	}
 
-	if (chars_remaining < count)
-		count = chars_remaining;
+	if (reader->chars_remaining < count)
+		count = reader->chars_remaining;
 
-	if (copy_to_user(buffer, ptr, count))
+	if (copy_to_user(buffer, reader->ptr, count))
 		return_VALUE(-EFAULT);
 
 	*ppos += count;
-	chars_remaining -= count;
-	ptr += count;
+	reader->chars_remaining -= count;
+	reader->ptr += count;
 
 	return_VALUE(count);
 }

@@ -159,19 +151,15 @@
 static int
 acpi_system_close_event(struct inode *inode, struct file *file)
 {
-	struct acpi_bus_event *event, *next;
+	struct acpi_event_reader *reader = file->private_data;
 
 	spin_lock_irq(&acpi_event_lock);
+	list_del(&reader->node);
+	reader_count--;
+	spin_unlock_irq(&acpi_event_lock);
 
-	/* We won't be interested in old events, will we? */
-	list_for_each_entry_safe(event, next, &acpi_event_list, node) {
-		list_del(&event->node);
-		kfree(event);
-	}
-
-	event_is_open = 0;
+	kfree(reader);
 
-	spin_unlock_irq(&acpi_event_lock);
 	return 0;
 }
 

@@ -180,8 +168,10 @@
 	struct file		*file,
 	poll_table		*wait)
 {
+	struct acpi_event_reader *reader = file->private_data;
+
 	poll_wait(file, &acpi_event_queue, wait);
-	if (!list_empty(&acpi_event_list))
+	if (reader->head != reader->tail)
 		return POLLIN | POLLRDNORM;
 	return 0;
 }

diff -Nru a/include/acpi/acpi_event.h b/include/acpi/acpi_event.h
@@ -31,7 +31,6 @@
 #include <acpi/acpi_bus.h>
 
 struct acpi_bus_event {
-	struct list_head	node;
 	acpi_device_class	device_class;
 	acpi_bus_id		bus_id;
 	u32			type;