Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b5a56dd authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'sysfs' into release

parents a0017f47 0794469d

drivers/acpi/ac.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -241,7 +241,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) 
		acpi_ac_get_state(ac);

		acpi_ac_get_state(ac);

		acpi_bus_generate_proc_event(device, event, (u32) ac->state);

		acpi_bus_generate_proc_event(device, event, (u32) ac->state);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event,

						  dev_name(&device->dev), event,

						  (u32) ac->state);

						  (u32) ac->state);

#ifdef CONFIG_ACPI_SYSFS_POWER

#ifdef CONFIG_ACPI_SYSFS_POWER

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

drivers/acpi/battery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -781,7 +781,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) 
	acpi_bus_generate_proc_event(device, event,

	acpi_bus_generate_proc_event(device, event,

				     acpi_battery_present(battery));

				     acpi_battery_present(battery));

	acpi_bus_generate_netlink_event(device->pnp.device_class,

	acpi_bus_generate_netlink_event(device->pnp.device_class,

					device->dev.bus_id, event,

					dev_name(&device->dev), event,

					acpi_battery_present(battery));

					acpi_battery_present(battery));

#ifdef CONFIG_ACPI_SYSFS_POWER

#ifdef CONFIG_ACPI_SYSFS_POWER

	/* acpi_batter_update could remove power_supply object */

	/* acpi_batter_update could remove power_supply object */

drivers/acpi/processor_core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -760,20 +760,20 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data) 
		acpi_bus_generate_proc_event(device, event,

		acpi_bus_generate_proc_event(device, event,

					pr->performance_platform_limit);

					pr->performance_platform_limit);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event,

						  dev_name(&device->dev), event,

						  pr->performance_platform_limit);

						  pr->performance_platform_limit);

		break;

		break;

	case ACPI_PROCESSOR_NOTIFY_POWER:

	case ACPI_PROCESSOR_NOTIFY_POWER:

		acpi_processor_cst_has_changed(pr);

		acpi_processor_cst_has_changed(pr);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event, 0);

						  dev_name(&device->dev), event, 0);

		break;

		break;

	case ACPI_PROCESSOR_NOTIFY_THROTTLING:

	case ACPI_PROCESSOR_NOTIFY_THROTTLING:

		acpi_processor_tstate_has_changed(pr);

		acpi_processor_tstate_has_changed(pr);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event, 0);

						  dev_name(&device->dev), event, 0);

	default:

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Unsupported event [0x%x]\n", event));

				  "Unsupported event [0x%x]\n", event));

drivers/acpi/scan.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -109,8 +109,7 @@ static int acpi_bus_hot_remove_device(void *context) 
		return 0;

		return 0;





	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

		"Hot-removing device %s...\n", device->dev.bus_id));

		"Hot-removing device %s...\n", dev_name(&device->dev)));







	if (acpi_bus_trim(device, 1)) {

	if (acpi_bus_trim(device, 1)) {

		printk(KERN_ERR PREFIX

		printk(KERN_ERR PREFIX
@@ -460,7 +459,7 @@ static int acpi_device_register(struct acpi_device *device, 
		acpi_device_bus_id->instance_no = 0;

		acpi_device_bus_id->instance_no = 0;

		list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);

		list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);

	}

	}

	sprintf(device->dev.bus_id, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);

	dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);





	if (device->parent) {

	if (device->parent) {

		list_add_tail(&device->node, &device->parent->children);

		list_add_tail(&device->node, &device->parent->children);
@@ -484,7 +483,8 @@ static int acpi_device_register(struct acpi_device *device, 




	result = acpi_device_setup_files(device);

	result = acpi_device_setup_files(device);

	if(result)

	if(result)

		printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n", device->dev.bus_id);

		printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n",

		       dev_name(&device->dev));





	device->removal_type = ACPI_BUS_REMOVAL_NORMAL;

	device->removal_type = ACPI_BUS_REMOVAL_NORMAL;

	return 0;

	return 0;

drivers/acpi/sleep/proc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -366,8 +366,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) 
			   dev->wakeup.state.enabled ? "enabled" : "disabled");

			   dev->wakeup.state.enabled ? "enabled" : "disabled");

		if (ldev)

		if (ldev)

			seq_printf(seq, "%s:%s",

			seq_printf(seq, "%s:%s",

				   ldev->bus ? ldev->bus->name : "no-bus",

				   dev_name(ldev) ? ldev->bus->name : "no-bus",

				   ldev->bus_id);

				   dev_name(ldev));

		seq_printf(seq, "\n");

		seq_printf(seq, "\n");

		put_device(ldev);

		put_device(ldev);