Merge branch 'misc' into release (be6066f3) · Commits · e / devices / android_kernel_sony_msm8994_rework

arch/x86/kernel/acpi/boot.c

+6 −16

Original line number	Original line	Diff line number	Diff line
	@@ -1529,16 +1529,10 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
	* if acpi_blacklisted() acpi_disabled = 1;		* if acpi_blacklisted() acpi_disabled = 1;
	* acpi_irq_model=...		* acpi_irq_model=...
	* ...		* ...
	*
	* return value: (currently ignored)
	* 0: success
	* !0: failure
	*/		*/

	int __init acpi_boot_table_init(void)		void __init acpi_boot_table_init(void)
	{		{
	int error;

	dmi_check_system(acpi_dmi_table);		dmi_check_system(acpi_dmi_table);

	/*		/*
	@@ -1546,15 +1540,14 @@ int __init acpi_boot_table_init(void)
	* One exception: acpi=ht continues far enough to enumerate LAPICs		* One exception: acpi=ht continues far enough to enumerate LAPICs
	*/		*/
	if (acpi_disabled && !acpi_ht)		if (acpi_disabled && !acpi_ht)
	return 1;		return;

	/*		/*
	* Initialize the ACPI boot-time table parser.		* Initialize the ACPI boot-time table parser.
	*/		*/
	error = acpi_table_init();		if (acpi_table_init()) {
	if (error) {
	disable_acpi();		disable_acpi();
	return error;		return;
	}		}

	acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);		acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
	@@ -1562,18 +1555,15 @@ int __init acpi_boot_table_init(void)
	/*		/*
	* blacklist may disable ACPI entirely		* blacklist may disable ACPI entirely
	*/		*/
	error = acpi_blacklisted();		if (acpi_blacklisted()) {
	if (error) {
	if (acpi_force) {		if (acpi_force) {
	printk(KERN_WARNING PREFIX "acpi=force override\n");		printk(KERN_WARNING PREFIX "acpi=force override\n");
	} else {		} else {
	printk(KERN_WARNING PREFIX "Disabling ACPI support\n");		printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
	disable_acpi();		disable_acpi();
	return error;		return;
	}		}
	}		}

	return 0;
	}		}

	int __init early_acpi_boot_init(void)		int __init early_acpi_boot_init(void)

drivers/acpi/pci_link.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@ ACPI_MODULE_NAME("pci_link");
	static int acpi_pci_link_add(struct acpi_device *device);		static int acpi_pci_link_add(struct acpi_device *device);
	static int acpi_pci_link_remove(struct acpi_device *device, int type);		static int acpi_pci_link_remove(struct acpi_device *device, int type);

	static struct acpi_device_id link_device_ids[] = {		static const struct acpi_device_id link_device_ids[] = {
	{"PNP0C0F", 0},		{"PNP0C0F", 0},
	{"", 0},		{"", 0},
	};		};

drivers/acpi/pci_root.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ static int acpi_pci_root_add(struct acpi_device *device);
	static int acpi_pci_root_remove(struct acpi_device *device, int type);		static int acpi_pci_root_remove(struct acpi_device *device, int type);
	static int acpi_pci_root_start(struct acpi_device *device);		static int acpi_pci_root_start(struct acpi_device *device);

	static struct acpi_device_id root_device_ids[] = {		static const struct acpi_device_id root_device_ids[] = {
	{"PNP0A03", 0},		{"PNP0A03", 0},
	{"", 0},		{"", 0},
	};		};

drivers/acpi/power.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ static int acpi_power_remove(struct acpi_device *device, int type);
	static int acpi_power_resume(struct acpi_device *device);		static int acpi_power_resume(struct acpi_device *device);
	static int acpi_power_open_fs(struct inode inode, struct file file);		static int acpi_power_open_fs(struct inode inode, struct file file);

	static struct acpi_device_id power_device_ids[] = {		static const struct acpi_device_id power_device_ids[] = {
	{ACPI_POWER_HID, 0},		{ACPI_POWER_HID, 0},
	{"", 0},		{"", 0},
	};		};

drivers/acpi/power_meter.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,7 @@ static int can_cap_in_hardware(void)
	return force_cap_on \|\| cap_in_hardware;		return force_cap_on \|\| cap_in_hardware;
	}		}

	static struct acpi_device_id power_meter_ids[] = {		static const struct acpi_device_id power_meter_ids[] = {
	{"ACPI000D", 0},		{"ACPI000D", 0},
	{"", 0},		{"", 0},
	};		};
	@@ -534,6 +534,7 @@ static void remove_domain_devices(struct acpi_power_meter_resource *resource)

	kfree(resource->domain_devices);		kfree(resource->domain_devices);
	kobject_put(resource->holders_dir);		kobject_put(resource->holders_dir);
			resource->num_domain_devices = 0;
	}		}

	static int read_domain_devices(struct acpi_power_meter_resource *resource)		static int read_domain_devices(struct acpi_power_meter_resource *resource)
	@@ -740,7 +741,6 @@ skip_unsafe_cap:

	return res;		return res;
	error:		error:
	remove_domain_devices(resource);
	remove_attrs(resource);		remove_attrs(resource);
	return res;		return res;
	}		}