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

Commit c94b4321 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: drivers/acpi: elide a non-zero test on a result that is never 0
  pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."
  cpuidle: fix 100% C0 statistics regression
  cpuidle: fix cpuidle time and usage overflow
  ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
  ACPI: fix a regression of ACPI device driver autoloading
  ACPI: SBS: remove typo from sbchc.c
parents f6d107fb 1192aeb9

drivers/acpi/fan.c

+16 −18
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static int acpi_fan_add(struct acpi_device *device) 
		result = PTR_ERR(cdev);

		goto end;

	}

	if (cdev) {

	printk(KERN_INFO PREFIX

		"%s is registered as cooling_device%d\n",

		device->dev.bus_id, cdev->id);
@@ -277,7 +276,6 @@ static int acpi_fan_add(struct acpi_device *device) 
				   "device");

	if (result)

		return result;

	}



	result = acpi_fan_add_fs(device);

	if (result)

drivers/acpi/processor_core.c

+14 −16
Original line number Diff line number Diff line
@@ -674,7 +674,6 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device) 
		result = PTR_ERR(pr->cdev);

		goto end;

	}

	if (pr->cdev) {

	printk(KERN_INFO PREFIX

		"%s is registered as cooling_device%d\n",

		device->dev.bus_id, pr->cdev->id);
@@ -689,7 +688,6 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device) 
				   "device");

	if (result)

		return result;

	}



	if (pr->flags.throttling) {

		printk(KERN_INFO PREFIX "%s [%s] (supports",

drivers/acpi/processor_idle.c

+5 −2
Original line number Diff line number Diff line
@@ -1487,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, 
		return 0;

	}



	acpi_unlazy_tlb(smp_processor_id());

	/*

	 * Must be done before busmaster disable as we might need to

	 * access HPET !
@@ -1577,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, 
		return 0;

	}



	acpi_unlazy_tlb(smp_processor_id());



	/* Tell the scheduler that we are going deep-idle: */

	sched_clock_idle_sleep_event();

	/*
@@ -1692,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) 
		switch (cx->type) {

			case ACPI_STATE_C1:

			state->flags |= CPUIDLE_FLAG_SHALLOW;

			if (cx->entry_method == ACPI_CSTATE_FFH)

				state->flags |= CPUIDLE_FLAG_TIME_VALID;



			state->enter = acpi_idle_enter_c1;

			dev->safe_state = state;

			break;

drivers/acpi/sbshc.c

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, 
		goto end;

	}

	smb_hc_write(hc, ACPI_SMB_COMMAND, command);

	smb_hc_write(hc, ACPI_SMB_COMMAND, command);

	if (!(protocol & 0x01)) {

		smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length);

		for (i = 0; i < length; ++i)

drivers/acpi/scan.c

+12 −6
Original line number Diff line number Diff line
@@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, 
			   int size)

{

	int len;

	int count;



	if (!acpi_dev->flags.hardware_id)

	if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)

		return -ENODEV;



	len = snprintf(modalias, size, "acpi:%s:",

	len = snprintf(modalias, size, "acpi:");

	size -= len;



	if (acpi_dev->flags.hardware_id) {

		count = snprintf(&modalias[len], size, "%s:",

				 acpi_dev->pnp.hardware_id);

	if (len < 0 || len >= size)

		if (count < 0 || count >= size)

			return -EINVAL;

	size -= len;

		len += count;

		size -= count;

	}



	if (acpi_dev->flags.compatible_ids) {

		struct acpi_compatible_id_list *cid_list;

		int i;

		int count;



		cid_list = acpi_dev->pnp.cid_list;

		for (i = 0; i < cid_list->count; i++) {