Explorar o código

qcacmn: Add "static" to fix compilation error for HL bus

Add "static" before some functions which only be used in 1 file to
resolve the compilation error.

Change-Id: I5bf80fe2e124bf4258c9bfdc997a5423773ca474
CRs-Fixed: 2010227
Yingying Tang %!s(int64=8) %!d(string=hai) anos
pai
achega
474bba0579

+ 3 - 4
hif/src/sdio/hif_bmi_reg_access.c

@@ -298,8 +298,7 @@ hif_bmi_buffer_receive(struct hif_sdio_dev *device,
  * Return: QDF_STATUS_SUCCESS for success.
  */
 QDF_STATUS hif_reg_based_get_target_info(struct hif_opaque_softc *hif_ctx,
-					 struct bmi_target_info
-					 *targ_info) {
+					 struct bmi_target_info *targ_info) {
 	QDF_STATUS status;
 	uint32_t cid;
 	struct hif_sdio_softc *scn = HIF_GET_SDIO_SOFTC(hif_ctx);
@@ -449,7 +448,7 @@ QDF_STATUS hif_exchange_bmi_msg(struct hif_opaque_softc *hif_ctx,
  * Return: QDF_STATUS_SUCCESS for success.
  */
 
-QDF_STATUS
+static QDF_STATUS
 hif_bmi_raw_write(struct hif_sdio_dev *device, char *buffer,
 	      uint32_t length) {
 	return hif_bmi_buffer_send(device, buffer, length);
@@ -464,7 +463,7 @@ hif_bmi_raw_write(struct hif_sdio_dev *device, char *buffer,
  *
  * Return: QDF_STATUS_SUCCESS for success.
  */
-QDF_STATUS
+static QDF_STATUS
 hif_bmi_raw_read(struct hif_sdio_dev *device, char *buffer,
 	     uint32_t length, bool want_timeout)
 {

+ 2 - 2
hif/src/sdio/hif_diag_reg_access.c

@@ -271,7 +271,7 @@ QDF_STATUS hif_diag_read_mem(struct hif_opaque_softc *scn,
  *
  * Return: QDF_STATUS_SUCCESS for success.
  */
-QDF_STATUS hif_ar6k_read_target_register(struct hif_sdio_dev *hif_device,
+static QDF_STATUS hif_ar6k_read_target_register(struct hif_sdio_dev *hif_device,
 					 int regsel, uint32_t *regval)
 {
 	QDF_STATUS status;
@@ -315,7 +315,7 @@ QDF_STATUS hif_ar6k_read_target_register(struct hif_sdio_dev *hif_device,
  *
  * Return: None
  */
-void hif_ar6k_fetch_target_regs(struct hif_sdio_dev *hif_device,
+static void hif_ar6k_fetch_target_regs(struct hif_sdio_dev *hif_device,
 		 uint32_t *targregs)
 {
 	int i;

+ 5 - 5
hif/src/sdio/hif_sdio_recv.c

@@ -826,11 +826,11 @@ static inline void hif_dev_free_recv_pkt_queue(HTC_PACKET_QUEUE *recv_pkt_queue)
 
 static
 QDF_STATUS hif_dev_recv_message_pending_handler(struct hif_sdio_device *pdev,
-				      uint8_t mail_box_index,
-				      uint32_t msg_look_aheads[],
-				      int num_look_aheads,
-				      bool *async_proc,
-				      int *num_pkts_fetched)
+					uint8_t mail_box_index,
+					uint32_t msg_look_aheads[],
+					int num_look_aheads,
+					bool *async_proc,
+					int *num_pkts_fetched)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	HTC_PACKET *packet;

+ 6 - 7
hif/src/sdio/if_sdio.c

@@ -214,7 +214,7 @@ err_alloc:
  *
  * Return: 0 for success and non-zero for failure
  */
-int
+static int
 ol_ath_sdio_configure(void *hif_sc, struct net_device *dev,
 		      hif_handle_t *hif_hdl)
 {
@@ -350,7 +350,7 @@ static int init_ath_hif_sdio(void)
  *
  * Return: bool
  */
-bool hif_targ_is_awake(struct hif_softc *scn, void *__iomem *mem)
+static bool hif_targ_is_awake(struct hif_softc *scn, void *__iomem *mem)
 {
 	return true;
 }
@@ -406,7 +406,7 @@ void hif_enable_power_gating(void *hif_ctx)
  *
  * Return: n/a
  */
-void hif_disable_aspm(void)
+static void hif_disable_aspm(void)
 {
 }
 
@@ -460,7 +460,7 @@ QDF_STATUS hif_sdio_open(struct hif_softc *hif_sc,
  *
  * Return: 0 for success
  */
-int hif_get_target_type(struct hif_softc *ol_sc, struct device *dev,
+static int hif_get_target_type(struct hif_softc *ol_sc, struct device *dev,
 	void *bdev, const hif_bus_id *bid, uint32_t *hif_type,
 	uint32_t *target_type)
 {
@@ -496,8 +496,7 @@ void hif_get_target_revision(struct hif_softc *ol_sc)
  * Return: QDF_STATUS
  */
 QDF_STATUS hif_sdio_enable_bus(struct hif_softc *hif_sc,
-			struct device *dev, void *bdev,
-			const struct hif_bus_id *bid,
+			struct device *dev, void *bdev, const hif_bus_id *bid,
 			enum hif_enable_type type)
 {
 	int ret = 0;
@@ -661,7 +660,7 @@ void hif_wlan_disable(struct hif_softc *scn)
  *
  * Return: int
  */
-int hif_config_target(void *hif_hdl)
+static int hif_config_target(void *hif_hdl)
 {
 	return 0;
 }

+ 3 - 3
hif/src/sdio/native_sdio/src/hif.c

@@ -858,7 +858,7 @@ static inline void sdio_card_state(struct mmc_card *card)
  *
  * Return: 0 on success, error number otherwise.
  */
-QDF_STATUS reinit_sdio(struct hif_sdio_dev *device)
+static QDF_STATUS reinit_sdio(struct hif_sdio_dev *device)
 {
 	int32_t err = 0;
 	struct mmc_host *host;
@@ -1029,7 +1029,7 @@ static int sdio_enable4bits(struct hif_sdio_dev *device, int enable)
  *
  * Return: 0 on success, error number otherwise.
  */
-QDF_STATUS
+static QDF_STATUS
 power_state_change_notify(struct hif_sdio_dev *device,
 			enum HIF_DEVICE_POWER_CHANGE_TYPE config)
 {
@@ -2592,7 +2592,7 @@ static void reset_all_cards(void)
 {
 }
 
-void hif_release_device(struct hif_opaque_softc *hif_ctx)
+static void hif_release_device(struct hif_opaque_softc *hif_ctx)
 {
 	struct hif_sdio_softc *scn = HIF_GET_SDIO_SOFTC(hif_ctx);
 	struct hif_sdio_dev *hif_device = scn->hif_handle;