summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManikandan Mohan <manikand@codeaurora.org>2017-04-07 17:57:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-19 15:39:28 -0700
commit53867f9eece1b59aa7fbc94429d4193afdd5ecc2 (patch)
tree267f1703f714b7af9724e6895c7f9c3d97c3b886
parent6fb85ec43ab6ce665b462ef5b573373a5d9f4ae7 (diff)
qcacmn: Fix kernel module check patch warnings in HIF SNOC files
Fix kernel module check patch warnings in HIF SNOC files Change-Id: I20f14f711ca00dfd9d59ee5edd0b3e2e32c90a11 CRs-fixed: 2033001
-rw-r--r--hif/src/snoc/hif_io32_snoc.h2
-rw-r--r--hif/src/snoc/if_ahb.c7
-rw-r--r--hif/src/snoc/if_ahb_reset.c8
-rw-r--r--hif/src/snoc/if_snoc.c5
4 files changed, 13 insertions, 9 deletions
diff --git a/hif/src/snoc/hif_io32_snoc.h b/hif/src/snoc/hif_io32_snoc.h
index 417e01eb2176..f2a181698ca2 100644
--- a/hif/src/snoc/hif_io32_snoc.h
+++ b/hif/src/snoc/hif_io32_snoc.h
@@ -45,6 +45,7 @@ static inline void ce_enable_irq_in_individual_register(struct hif_softc *scn,
int ce_id)
{
uint32_t offset;
+
offset = HOST_IE_ADDRESS + CE_BASE_ADDRESS(ce_id);
hif_write32_mb(scn->mem + offset, 1);
}
@@ -53,6 +54,7 @@ static inline void ce_disable_irq_in_individual_register(struct hif_softc *scn,
int ce_id)
{
uint32_t offset;
+
offset = HOST_IE_ADDRESS + CE_BASE_ADDRESS(ce_id);
hif_write32_mb(scn->mem + offset, 0);
hif_read32_mb(scn->mem + offset);
diff --git a/hif/src/snoc/if_ahb.c b/hif/src/snoc/if_ahb.c
index 6f986fd14bbe..74f864a3b633 100644
--- a/hif/src/snoc/if_ahb.c
+++ b/hif/src/snoc/if_ahb.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -211,10 +211,9 @@ int hif_target_sync_ahb(struct hif_softc *scn)
if (wait_limit < 0) {
HIF_TRACE("%s: FW signal timed out", __func__);
return -EIO;
- } else {
- HIF_TRACE("%s: Got FW signal, retries = %x", __func__,
- 500-wait_limit);
}
+ HIF_TRACE("%s: Got FW signal, retries = %x", __func__,
+ 500-wait_limit);
}
return 0;
diff --git a/hif/src/snoc/if_ahb_reset.c b/hif/src/snoc/if_ahb_reset.c
index 6901f4251fee..8a45cc53e76c 100644
--- a/hif/src/snoc/if_ahb_reset.c
+++ b/hif/src/snoc/if_ahb_reset.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -155,7 +155,8 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc,
}
/* TBD: Temporary changes. Frequency should be
- retrieved through clk_xxx once kernel GCC driver is available */
+ * retrieved through clk_xxx once kernel GCC driver is available
+ */
{
void __iomem *mem_gcc;
uint32_t clk_sel;
@@ -318,7 +319,8 @@ void hif_ahb_device_reset(struct hif_softc *scn)
reset_control_assert(core_resetctl);
/* TBD: Check if we should also assert other bits (radio_cold, radio_
- warm, radio_srif, cpu_ini) */
+ * warm, radio_srif, cpu_ini)
+ */
qdf_mdelay(1); /* TBD: Get reqd delay from HW team */
/* Assert radio cold reset */
diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c
index b7d5153d5451..7b02e86beb19 100644
--- a/hif/src/snoc/if_snoc.c
+++ b/hif/src/snoc/if_snoc.c
@@ -63,10 +63,10 @@ void hif_snoc_disable_isr(struct hif_softc *scn)
/**
* hif_dump_registers(): dump bus debug registers
- * @scn: struct hif_opaque_softc
+ * @hif_ctx: struct hif_opaque_softc
*
* This function dumps hif bus debug registers
- *
+ *
* Return: 0 for success or error code
*/
int hif_snoc_dump_registers(struct hif_softc *hif_ctx)
@@ -325,6 +325,7 @@ void hif_snoc_disable_bus(struct hif_softc *scn)
void hif_snoc_nointrs(struct hif_softc *scn)
{
struct HIF_CE_state *hif_state = HIF_GET_CE_STATE(scn);
+
if (scn->request_irq_done) {
ce_unregister_irq(hif_state, 0xfff);
scn->request_irq_done = false;