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

Commit 741438b5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Andi Kleen
Browse files

ACPI PM: Remove obsolete Toshiba workaround 



Remove the obsolete workaround for a Toshiba Satellite 4030cdt
S1 problem from drivers/acpi/sleep/main.c .

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a80a6da1

drivers/acpi/sleep/main.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -61,8 +61,6 @@ static u32 acpi_suspend_states[] = { 
	[PM_SUSPEND_MAX] = ACPI_STATE_S5

	[PM_SUSPEND_MAX] = ACPI_STATE_S5

};

};





static int init_8259A_after_S1;



/**

/**

 *	acpi_suspend_begin - Set the target system sleep state to the state

 *	acpi_suspend_begin - Set the target system sleep state to the state

 *		associated with given @pm_state, if supported.

 *		associated with given @pm_state, if supported.
@@ -185,13 +183,6 @@ static void acpi_suspend_finish(void) 
	acpi_set_firmware_waking_vector((acpi_physical_address) 0);

	acpi_set_firmware_waking_vector((acpi_physical_address) 0);





	acpi_target_sleep_state = ACPI_STATE_S0;

	acpi_target_sleep_state = ACPI_STATE_S0;



#ifdef CONFIG_X86

	if (init_8259A_after_S1) {

		printk("Broken toshiba laptop -> kicking interrupts\n");

		init_8259A(0);

	}

#endif

}

}





/**

/**
@@ -231,26 +222,6 @@ static struct platform_suspend_ops acpi_suspend_ops = { 
	.finish = acpi_suspend_finish,

	.finish = acpi_suspend_finish,

	.end = acpi_suspend_end,

	.end = acpi_suspend_end,

};

};



/*

 * Toshiba fails to preserve interrupts over S1, reinitialization

 * of 8259 is needed after S1 resume.

 */

static int __init init_ints_after_s1(const struct dmi_system_id *d)

{

	printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident);

	init_8259A_after_S1 = 1;

	return 0;

}



static struct dmi_system_id __initdata acpisleep_dmi_table[] = {

	{

	 .callback = init_ints_after_s1,

	 .ident = "Toshiba Satellite 4030cdt",

	 .matches = {DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),},

	 },

	{},

};

#endif /* CONFIG_SUSPEND */

#endif /* CONFIG_SUSPEND */





#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATION
@@ -472,8 +443,6 @@ int __init acpi_sleep_init(void) 
	u8 type_a, type_b;

	u8 type_a, type_b;

#ifdef CONFIG_SUSPEND

#ifdef CONFIG_SUSPEND

	int i = 0;

	int i = 0;



	dmi_check_system(acpisleep_dmi_table);

#endif

#endif





	if (acpi_disabled)

	if (acpi_disabled)