Commit 228b79aa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-processor', 'acpi-cppc', 'acpi-dbg', 'acpi-misc' and 'acpi-pci' 

* acpi-processor:
  ACPI: processor: idle: Allow probing on platforms with one ACPI C-state

* acpi-cppc:
  ACPI: CPPC: Fix reference count leak in acpi_cppc_processor_probe()
  ACPI: CPPC: Make some symbols static

* acpi-dbg:
  ACPI: debug: Make two functions static

* acpi-misc:
  ACPI: GED: use correct trigger type field in _Exx / _Lxx handling
  ACPI: GED: add support for _Exx / _Lxx handler methods
  ACPI: Delete unused proc filename macros

* acpi-pci:
  ACPI: hotplug: PCI: Use the new acpi_evaluate_reg() helper
  ACPI: utils: Add acpi_evaluate_reg() helper
parents 48c60415 496121c0 4d8be4bc 8e22c2e4 e5c399b0 6dd10c47

drivers/acpi/acpi_dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static const struct acpi_debugger_ops acpi_aml_debugger = { 
	.notify_command_complete = acpi_aml_notify_command_complete,

};



int __init acpi_aml_init(void)

static int __init acpi_aml_init(void)

{

	int ret;
@@ -771,7 +771,7 @@ int __init acpi_aml_init(void) 
	return 0;

}



void __exit acpi_aml_exit(void)

static void __exit acpi_aml_exit(void)

{

	if (acpi_aml_initialized) {

		acpi_unregister_debugger(&acpi_aml_debugger);

drivers/acpi/button.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define PREFIX "ACPI: "



#define ACPI_BUTTON_CLASS		"button"

#define ACPI_BUTTON_FILE_INFO		"info"

#define ACPI_BUTTON_FILE_STATE		"state"

#define ACPI_BUTTON_TYPE_UNKNOWN	0x00

#define ACPI_BUTTON_NOTIFY_STATUS	0x80

drivers/acpi/cppc_acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static void cppc_chan_tx_done(struct mbox_client *cl, void *msg, int ret) 
				*(u16 *)msg, ret);

}



struct mbox_client cppc_mbox_cl = {

static struct mbox_client cppc_mbox_cl = {

	.tx_done = cppc_chan_tx_done,

	.knows_txdone = true,

};
@@ -597,7 +597,7 @@ bool __weak cpc_ffh_supported(void) 
 *

 * Return: 0 for success, errno for failure

 */

int pcc_data_alloc(int pcc_ss_id)

static int pcc_data_alloc(int pcc_ss_id)

{

	if (pcc_ss_id < 0 || pcc_ss_id >= MAX_PCC_SUBSPACES)

		return -EINVAL;
@@ -846,6 +846,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
			"acpi_cppc");

	if (ret) {

		per_cpu(cpc_desc_ptr, pr->id) = NULL;

		kobject_put(&cpc_ptr->kobj);

		goto out_free;

	}

drivers/acpi/ec.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 


#define ACPI_EC_CLASS			"embedded_controller"

#define ACPI_EC_DEVICE_NAME		"Embedded Controller"

#define ACPI_EC_FILE_INFO		"info"



/* EC status register */

#define ACPI_EC_FLAG_OBF	0x01	/* Output buffer full */

drivers/acpi/evged.c

+19 −3
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, 
	struct resource r;

	struct acpi_resource_irq *p = &ares->data.irq;

	struct acpi_resource_extended_irq *pext = &ares->data.extended_irq;

	char ev_name[5];

	u8 trigger;



	if (ares->type == ACPI_RESOURCE_TYPE_END_TAG)

		return AE_OK;
@@ -87,14 +89,28 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, 
		dev_err(dev, "unable to parse IRQ resource\n");

		return AE_ERROR;

	}

	if (ares->type == ACPI_RESOURCE_TYPE_IRQ)

	if (ares->type == ACPI_RESOURCE_TYPE_IRQ) {

		gsi = p->interrupts[0];

	else

		trigger = p->triggering;

	} else {

		gsi = pext->interrupts[0];

		trigger = pext->triggering;

	}



	irq = r.start;



	if (ACPI_FAILURE(acpi_get_handle(handle, "_EVT", &evt_handle))) {

	switch (gsi) {

	case 0 ... 255:

		sprintf(ev_name, "_%c%02hhX",

			trigger == ACPI_EDGE_SENSITIVE ? 'E' : 'L', gsi);



		if (ACPI_SUCCESS(acpi_get_handle(handle, ev_name, &evt_handle)))

			break;

		/* fall through */

	default:

		if (ACPI_SUCCESS(acpi_get_handle(handle, "_EVT", &evt_handle)))

			break;



		dev_err(dev, "cannot locate _EVT method\n");

		return AE_ERROR;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE