Commit d2fadbbb authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

Revert "ACPI: ibm-acpi: make non-generic bay support optional" 



This reverts commit 2df910b4.

ACPI_BAY has not been merged into mainline yet, so the changes to ibm-acpi
related Kconfig entries that depend on ACPI_BAY were permanently disabling
ibm-acpi bay support.  This is a serious regression for ThinkPad users.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8f6d63ad

drivers/acpi/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -225,17 +225,6 @@ config ACPI_IBM_DOCK 


	  If you are not sure, say N here.



config ACPI_IBM_BAY

	bool "Legacy Removable Bay Support"

	depends on ACPI_IBM

	depends on ACPI_BAY=n

	default n

	---help---

	  Allows the ibm_acpi driver to handle removable bays.

	  This support is obsoleted by CONFIG_ACPI_BAY.



	  If you are not sure, say N here.



config ACPI_TOSHIBA

	tristate "Toshiba Laptop Extras"

	depends on X86

drivers/acpi/ibm_acpi.c

+1 −12
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK", /* X30, X31, X40 */ 
	   "\\_SB.PCI.ISA.SLCE",	/* 570 */

    );				/* A21e,G4x,R30,R31,R32,R40,R40e,R50e */

#endif

#ifdef CONFIG_ACPI_IBM_BAY

IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",	/* 570 */

	   "\\_SB.PCI0.IDE0.IDES.IDSM",	/* 600e/x, 770e, 770x */

	   "\\_SB.PCI0.SATA.SCND.MSTR",	/* T60, X60, Z60 */
@@ -175,7 +174,6 @@ IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV", /* A3x, R32 */ 
IBM_HANDLE(bay2_ej, bay2, "_EJ3",	/* 600e/x, 770e, A3x */

	   "_EJ0",		/* 770x */

    );				/* all others */

#endif



/* don't list other alternatives as we install a notify handler on the 570 */

IBM_HANDLE(pci, root, "\\_SB.PCI");	/* 570 */
@@ -1042,7 +1040,6 @@ static int light_write(char *buf) 
	return 0;

}



#if defined(CONFIG_ACPI_IBM_DOCK) || defined(CONFIG_ACPI_IBM_BAY)

static int _sta(acpi_handle handle)

{

	int status;
@@ -1052,7 +1049,7 @@ static int _sta(acpi_handle handle) 


	return status;

}

#endif



#ifdef CONFIG_ACPI_IBM_DOCK

#define dock_docked() (_sta(dock_handle) & 1)
@@ -1118,7 +1115,6 @@ static void dock_notify(struct ibm_struct *ibm, u32 event) 
}

#endif



#ifdef CONFIG_ACPI_IBM_BAY

static int bay_status_supported;

static int bay_status2_supported;

static int bay_eject_supported;
@@ -1194,7 +1190,6 @@ static void bay_notify(struct ibm_struct *ibm, u32 event) 
{

	acpi_bus_generate_event(ibm->device, event, 0);

}

#endif



static int cmos_read(char *p)

{
@@ -2354,7 +2349,6 @@ static struct ibm_struct ibms[] = { 
	 .type = ACPI_SYSTEM_NOTIFY,

	 },

#endif

#ifdef CONFIG_ACPI_IBM_BAY

	{

	 .name = "bay",

	 .init = bay_init,
@@ -2364,7 +2358,6 @@ static struct ibm_struct ibms[] = { 
	 .handle = &bay_handle,

	 .type = ACPI_SYSTEM_NOTIFY,

	 },

#endif

	{

	 .name = "cmos",

	 .read = cmos_read,
@@ -2650,9 +2643,7 @@ IBM_PARAM(light); 
#ifdef CONFIG_ACPI_IBM_DOCK

IBM_PARAM(dock);

#endif

#ifdef CONFIG_ACPI_IBM_BAY

IBM_PARAM(bay);

#endif

IBM_PARAM(cmos);

IBM_PARAM(led);

IBM_PARAM(beep);
@@ -2735,14 +2726,12 @@ static int __init acpi_ibm_init(void) 
	IBM_HANDLE_INIT(dock);

#endif

	IBM_HANDLE_INIT(pci);

#ifdef CONFIG_ACPI_IBM_BAY

	IBM_HANDLE_INIT(bay);

	if (bay_handle)

		IBM_HANDLE_INIT(bay_ej);

	IBM_HANDLE_INIT(bay2);

	if (bay2_handle)

		IBM_HANDLE_INIT(bay2_ej);

#endif

	IBM_HANDLE_INIT(beep);

	IBM_HANDLE_INIT(ecrd);

	IBM_HANDLE_INIT(ecwr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE