Commit 09396a4f authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: fw: make some ACPI functions static 



iwl_acpi_get_wifi_pkg_range(), iwl_acpi_get_wifi_pkg() and
iwl_acpi_get_object() need not be exported etc., they're used
only within the same file. Make them static.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230614123446.e866032e4106.Ifede7f7c25b17a8215b154ce01da513b75384325@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 84969e0f

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

+18 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2017 Intel Deutschland GmbH

 * Copyright (C) 2019-2022 Intel Corporation

 * Copyright (C) 2019-2023 Intel Corporation

 */

#include <linux/uuid.h>

#include <linux/dmi.h>
@@ -94,7 +94,7 @@ static int iwl_acpi_get_handle(struct device *dev, acpi_string method, 
	return 0;

}



void *iwl_acpi_get_object(struct device *dev, acpi_string method)

static void *iwl_acpi_get_object(struct device *dev, acpi_string method)

{

	struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};

	acpi_handle handle;
@@ -115,7 +115,6 @@ void *iwl_acpi_get_object(struct device *dev, acpi_string method) 
	}

	return buf.pointer;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_object);



/*

 * Generic function for evaluating a method defined in the device specific
@@ -237,7 +236,8 @@ int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func, 
}

IWL_EXPORT_SYMBOL(iwl_acpi_get_dsm_u32);



union acpi_object *iwl_acpi_get_wifi_pkg_range(struct device *dev,

static union acpi_object *

iwl_acpi_get_wifi_pkg_range(struct device *dev,

			    union acpi_object *data,

			    int min_data_size,

			    int max_data_size,
@@ -292,7 +292,16 @@ union acpi_object *iwl_acpi_get_wifi_pkg_range(struct device *dev, 
found:

	return wifi_pkg;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg_range);



static union acpi_object *

iwl_acpi_get_wifi_pkg(struct device *dev,

		      union acpi_object *data,

		      int data_size, int *tbl_rev)

{

	return iwl_acpi_get_wifi_pkg_range(dev, data, data_size, data_size,

					   tbl_rev);

}





int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

		     union iwl_tas_config_cmd *cmd, int fw_ver)

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

+1 −31
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2022 Intel Corporation

 * Copyright (C) 2018-2023 Intel Corporation

 */

#ifndef __iwl_fw_acpi__

#define __iwl_fw_acpi__
@@ -168,19 +168,12 @@ struct iwl_fw_runtime; 
extern const guid_t iwl_guid;

extern const guid_t iwl_rfi_guid;



void *iwl_acpi_get_object(struct device *dev, acpi_string method);



int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func,

			const guid_t *guid, u8 *value);



int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func,

			 const guid_t *guid, u32 *value);



union acpi_object *iwl_acpi_get_wifi_pkg_range(struct device *dev,

					       union acpi_object *data,

					       int min_data_size,

					       int max_data_size,

					       int *tbl_rev);

/**

 * iwl_acpi_get_mcc - read MCC from ACPI, if available

 *
@@ -234,11 +227,6 @@ bool iwl_acpi_is_ppag_approved(struct iwl_fw_runtime *fwrt); 


#else /* CONFIG_ACPI */



static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)

{

	return ERR_PTR(-ENOENT);

}



static inline void *iwl_acpi_get_dsm_object(struct device *dev, int rev,

					    int func, union acpi_object *args)

{
@@ -257,15 +245,6 @@ static inline int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func, 
	return -ENOENT;

}



static inline union acpi_object *

iwl_acpi_get_wifi_pkg_range(struct device *dev,

			    union acpi_object *data,

			    int min_data_size, int max_data_size,

			    int *tbl_rev)

{

	return ERR_PTR(-ENOENT);

}



static inline int iwl_acpi_get_mcc(struct device *dev, char *mcc)

{

	return -ENOENT;
@@ -337,13 +316,4 @@ static inline bool iwl_acpi_is_ppag_approved(struct iwl_fw_runtime *fwrt) 


#endif /* CONFIG_ACPI */



static inline union acpi_object *

iwl_acpi_get_wifi_pkg(struct device *dev,

		      union acpi_object *data,

		      int data_size, int *tbl_rev)

{

	return iwl_acpi_get_wifi_pkg_range(dev, data, data_size, data_size,

					   tbl_rev);

}



#endif /* __iwl_fw_acpi__ */