Commit c68ae33e authored by Lukas Wunner's avatar Lukas Wunner Committed by Rafael J. Wysocki
Browse files

ACPI / utils: Rename acpi_dev_present() 



acpi_dev_present() was originally named after pci_dev_present()
to signify the similarity of the two functions.

However Rafael J. Wysocki pointed out that the exported function
acpi_dev_present() is easily confused with the non-exported
acpi_device_is_present(). Additionally in ACPI parlance the term
"present" usually refers to the "device is present" bit returned
by the _STA control method, yet acpi_dev_present() merely checks
presence in the namespace. It does not invoke _STA at all, let
alone check the "device is present" bit.

As suggested by Rafael, rename the function to acpi_dev_found()
and adjust all existing call sites.

Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9735a227

drivers/acpi/utils.c

+3 −3
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs) 
EXPORT_SYMBOL(acpi_check_dsm);



/**

 * acpi_dev_present - Detect presence of a given ACPI device in the system.

 * acpi_dev_found - Detect presence of a given ACPI device in the namespace.

 * @hid: Hardware ID of the device.

 *

 * Return %true if the device was present at the moment of invocation.
@@ -719,7 +719,7 @@ EXPORT_SYMBOL(acpi_check_dsm); 
 * instead). Calling from module_init() is fine (which is synonymous

 * with device_initcall()).

 */

bool acpi_dev_present(const char *hid)

bool acpi_dev_found(const char *hid)

{

	struct acpi_device_bus_id *acpi_device_bus_id;

	bool found = false;
@@ -734,7 +734,7 @@ bool acpi_dev_present(const char *hid) 


	return found;

}

EXPORT_SYMBOL(acpi_dev_present);

EXPORT_SYMBOL(acpi_dev_found);



/*

 * acpi_backlight= handling, this is done here rather then in video_detect.c

include/acpi/acpi_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, int rev, int func, 
	  .package.elements = (eles)			\

	}



bool acpi_dev_present(const char *hid);

bool acpi_dev_found(const char *hid);



#ifdef CONFIG_ACPI

include/linux/apple-gmux.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
 */

static inline bool apple_gmux_present(void)

{

	return acpi_dev_present(GMUX_ACPI_HID);

	return acpi_dev_found(GMUX_ACPI_HID);

}



#else  /* !CONFIG_APPLE_GMUX */

sound/pci/hda/thinkpad_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ static void (*old_vmaster_hook)(void *, int); 
static bool is_thinkpad(struct hda_codec *codec)

{

	return (codec->core.subsystem_id >> 16 == 0x17aa) &&

	       (acpi_dev_present("LEN0068") || acpi_dev_present("IBM0068"));

	       (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068"));

}



static void update_tpacpi_mute_led(void *private_data, int enabled)

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	if (!drv)

		return -ENOMEM;



	drv->ts3a227e_present = acpi_dev_present("104C227E");

	drv->ts3a227e_present = acpi_dev_found("104C227E");

	if (!drv->ts3a227e_present) {

		/* no need probe TI jack detection chip */

		snd_soc_card_cht.aux_dev = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE