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

Commit fb318cbf authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPI: cpufreq: use new bit register access function 



> arch/x86/kernel/cpu/cpufreq/longhaul.c: In function 'longhaul_setstate':
> arch/x86/kernel/cpu/cpufreq/longhaul.c:308: error: implicit declaration of function 'acpi_set_register'

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Compile-tested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 14eecfc1

arch/x86/kernel/cpu/cpufreq/longhaul.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -303,7 +303,7 @@ static void longhaul_setstate(unsigned int table_index) 
		outb(3, 0x22);

		outb(3, 0x22);

	} else if ((pr != NULL) && pr->flags.bm_control) {

	} else if ((pr != NULL) && pr->flags.bm_control) {

		/* Disable bus master arbitration */

		/* Disable bus master arbitration */

		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);

		acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1);

	}

	}

	switch (longhaul_version) {

	switch (longhaul_version) {
@@ -326,7 +326,7 @@ static void longhaul_setstate(unsigned int table_index) 
	case TYPE_POWERSAVER:

	case TYPE_POWERSAVER:

		if (longhaul_flags & USE_ACPI_C3) {

		if (longhaul_flags & USE_ACPI_C3) {

			/* Don't allow wakeup */

			/* Don't allow wakeup */

			acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);

			acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0);

			do_powersaver(cx->address, clock_ratio_index, dir);

			do_powersaver(cx->address, clock_ratio_index, dir);

		} else {

		} else {

			do_powersaver(0, clock_ratio_index, dir);

			do_powersaver(0, clock_ratio_index, dir);
@@ -339,7 +339,7 @@ static void longhaul_setstate(unsigned int table_index) 
		outb(0, 0x22);

		outb(0, 0x22);

	} else if ((pr != NULL) && pr->flags.bm_control) {

	} else if ((pr != NULL) && pr->flags.bm_control) {

		/* Enable bus master arbitration */

		/* Enable bus master arbitration */

		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);

		acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);

	}

	}

	outb(pic2_mask,0xA1);	/* restore mask */

	outb(pic2_mask,0xA1);	/* restore mask */

	outb(pic1_mask,0x21);

	outb(pic1_mask,0x21);