mirror of
https://github.com/NixOS/mobile-nixos.git
synced 2024-12-15 19:23:01 +03:00
delete unused patches originally from addison
This commit is contained in:
Daniel Barlow
parent
632fa13be0
commit
7609e0a90e
@ -1,167 +0,0 @@
|
||||
From fdc7172e522c9a4c9d16467688a8913b18fb39d3 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Date: Wed, 4 Dec 2019 02:57:47 -0500
|
||||
Subject: [PATCH 2/6] Allow building qualcomm audio without CONFIG_DEBUG_FS
|
||||
|
||||
---
|
||||
drivers/misc/qcom/qdsp6v2/audio_alac.c | 4 ++++
|
||||
drivers/misc/qcom/qdsp6v2/audio_ape.c | 4 ++++
|
||||
drivers/misc/qcom/qdsp6v2/audio_g711alaw.c | 4 ++++
|
||||
drivers/misc/qcom/qdsp6v2/audio_g711mlaw.c | 4 ++++
|
||||
sound/soc/codecs/wm_adsp.h | 4 +---
|
||||
5 files changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/misc/qcom/qdsp6v2/audio_alac.c b/drivers/misc/qcom/qdsp6v2/audio_alac.c
|
||||
index 646d37da1ba3..fef5352f58bc 100644
|
||||
--- a/drivers/misc/qcom/qdsp6v2/audio_alac.c
|
||||
+++ b/drivers/misc/qcom/qdsp6v2/audio_alac.c
|
||||
@@ -19,6 +19,7 @@
|
||||
static struct miscdevice audio_alac_misc;
|
||||
static struct ws_mgr audio_alac_ws_mgr;
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
static const struct file_operations audio_alac_debug_fops = {
|
||||
.read = audio_aio_debug_read,
|
||||
.open = audio_aio_debug_open,
|
||||
@@ -29,6 +30,7 @@ static struct dentry *config_debugfs_create_file(const char *name, void *data)
|
||||
return debugfs_create_file(name, S_IFREG | S_IRUGO,
|
||||
NULL, (void *)data, &audio_alac_debug_fops);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int alac_channel_map(u8 *channel_mapping, uint32_t channels);
|
||||
|
||||
@@ -336,11 +338,13 @@ static int audio_open(struct inode *inode, struct file *file)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
snprintf(name, sizeof(name), "msm_alac_%04x", audio->ac->session);
|
||||
audio->dentry = config_debugfs_create_file(name, (void *)audio);
|
||||
|
||||
if (IS_ERR_OR_NULL(audio->dentry))
|
||||
pr_debug("debugfs_create_file failed\n");
|
||||
+#endif
|
||||
pr_debug("%s:alacdec success mode[%d]session[%d]\n", __func__,
|
||||
audio->feedback,
|
||||
audio->ac->session);
|
||||
diff --git a/drivers/misc/qcom/qdsp6v2/audio_ape.c b/drivers/misc/qcom/qdsp6v2/audio_ape.c
|
||||
index 737151279c27..c824d68569d0 100644
|
||||
--- a/drivers/misc/qcom/qdsp6v2/audio_ape.c
|
||||
+++ b/drivers/misc/qcom/qdsp6v2/audio_ape.c
|
||||
@@ -19,6 +19,7 @@
|
||||
static struct miscdevice audio_ape_misc;
|
||||
static struct ws_mgr audio_ape_ws_mgr;
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
static const struct file_operations audio_ape_debug_fops = {
|
||||
.read = audio_aio_debug_read,
|
||||
.open = audio_aio_debug_open,
|
||||
@@ -28,6 +29,7 @@ static struct dentry *config_debugfs_create_file(const char *name, void *data)
|
||||
return debugfs_create_file(name, S_IFREG | S_IRUGO,
|
||||
NULL, (void *)data, &audio_ape_debug_fops);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static long audio_ioctl_shared(struct file *file, unsigned int cmd,
|
||||
void *arg)
|
||||
@@ -317,11 +319,13 @@ static int audio_open(struct inode *inode, struct file *file)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
snprintf(name, sizeof(name), "msm_ape_%04x", audio->ac->session);
|
||||
audio->dentry = config_debugfs_create_file(name, (void *)audio);
|
||||
|
||||
if (IS_ERR_OR_NULL(audio->dentry))
|
||||
pr_debug("debugfs_create_file failed\n");
|
||||
+#endif
|
||||
pr_debug("%s:apedec success mode[%d]session[%d]\n", __func__,
|
||||
audio->feedback,
|
||||
audio->ac->session);
|
||||
diff --git a/drivers/misc/qcom/qdsp6v2/audio_g711alaw.c b/drivers/misc/qcom/qdsp6v2/audio_g711alaw.c
|
||||
index 10df85f50ac1..535395e15a08 100644
|
||||
--- a/drivers/misc/qcom/qdsp6v2/audio_g711alaw.c
|
||||
+++ b/drivers/misc/qcom/qdsp6v2/audio_g711alaw.c
|
||||
@@ -19,6 +19,7 @@
|
||||
static struct miscdevice audio_g711alaw_misc;
|
||||
static struct ws_mgr audio_g711_ws_mgr;
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
static const struct file_operations audio_g711_debug_fops = {
|
||||
.read = audio_aio_debug_read,
|
||||
.open = audio_aio_debug_open,
|
||||
@@ -29,6 +30,7 @@ static struct dentry *config_debugfs_create_file(const char *name, void *data)
|
||||
return debugfs_create_file(name, S_IFREG | S_IRUGO,
|
||||
NULL, (void *)data, &audio_g711_debug_fops);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int g711_channel_map(u8 *channel_mapping, uint32_t channels);
|
||||
|
||||
@@ -286,11 +288,13 @@ static int audio_open(struct inode *inode, struct file *file)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
snprintf(name, sizeof(name), "msm_g711_%04x", audio->ac->session);
|
||||
audio->dentry = config_debugfs_create_file(name, (void *)audio);
|
||||
|
||||
if (IS_ERR_OR_NULL(audio->dentry))
|
||||
pr_debug("%s: debugfs_create_file failed\n", __func__);
|
||||
+#endif
|
||||
pr_debug("%s: g711dec success mode[%d]session[%d]\n", __func__,
|
||||
audio->feedback,
|
||||
audio->ac->session);
|
||||
diff --git a/drivers/misc/qcom/qdsp6v2/audio_g711mlaw.c b/drivers/misc/qcom/qdsp6v2/audio_g711mlaw.c
|
||||
index 33fb3685965e..b6727f9a22cc 100644
|
||||
--- a/drivers/misc/qcom/qdsp6v2/audio_g711mlaw.c
|
||||
+++ b/drivers/misc/qcom/qdsp6v2/audio_g711mlaw.c
|
||||
@@ -19,6 +19,7 @@
|
||||
static struct miscdevice audio_g711mlaw_misc;
|
||||
static struct ws_mgr audio_g711_ws_mgr;
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
static const struct file_operations audio_g711_debug_fops = {
|
||||
.read = audio_aio_debug_read,
|
||||
.open = audio_aio_debug_open,
|
||||
@@ -29,6 +30,7 @@ static struct dentry *config_debugfs_create_file(const char *name, void *data)
|
||||
return debugfs_create_file(name, S_IFREG | S_IRUGO,
|
||||
NULL, (void *)data, &audio_g711_debug_fops);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int g711_channel_map(u8 *channel_mapping, uint32_t channels);
|
||||
|
||||
@@ -285,11 +287,13 @@ static int audio_open(struct inode *inode, struct file *file)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
snprintf(name, sizeof(name), "msm_g711_%04x", audio->ac->session);
|
||||
audio->dentry = config_debugfs_create_file(name, (void *)audio);
|
||||
|
||||
if (IS_ERR_OR_NULL(audio->dentry))
|
||||
pr_debug("%s: debugfs_create_file failed\n", __func__);
|
||||
+#endif
|
||||
pr_debug("%s: g711dec success mode[%d]session[%d]\n", __func__,
|
||||
audio->feedback,
|
||||
audio->ac->session);
|
||||
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
|
||||
index b09e4c9c4cc1..3012ed1d5d73 100644
|
||||
--- a/sound/soc/codecs/wm_adsp.h
|
||||
+++ b/sound/soc/codecs/wm_adsp.h
|
||||
@@ -186,9 +186,7 @@ static inline void wm_adsp_init_debugfs(struct wm_adsp *dsp,
|
||||
{
|
||||
}
|
||||
|
||||
-void wm_adsp_cleanup_debugfs(struct wm_adsp *dsp)
|
||||
-{
|
||||
-}
|
||||
+void wm_adsp_cleanup_debugfs(struct wm_adsp *dsp);
|
||||
#endif
|
||||
|
||||
int wm_adsp1_event(struct snd_soc_dapm_widget *w,
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
From 83f926eaf84c62c3e7a479a10a8fcf5847ae3bac Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Date: Wed, 4 Dec 2019 02:58:15 -0500
|
||||
Subject: [PATCH 3/6] Allow building qualcomm mdss without CONFIG_DEBUG_FS
|
||||
|
||||
---
|
||||
drivers/video/msm/mdss/mdss_debug.h | 5 -----
|
||||
drivers/video/msm/mdss/mdss_debug_xlog.c | 4 ++++
|
||||
drivers/video/msm/mdss/mdss_mdp_debug.c | 2 ++
|
||||
drivers/video/msm/mdss/mdss_mdp_overlay.c | 6 ++++++
|
||||
drivers/video/msm/mdss/mdss_smmu.c | 2 ++
|
||||
5 files changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/video/msm/mdss/mdss_debug.h b/drivers/video/msm/mdss/mdss_debug.h
|
||||
index dad43ca56678..f41d22f6d18f 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_debug.h
|
||||
+++ b/drivers/video/msm/mdss/mdss_debug.h
|
||||
@@ -227,11 +227,6 @@ static inline void mdss_xlog(const char *name, int line, int flag, ...) { }
|
||||
static inline void mdss_dsi_debug_check_te(struct mdss_panel_data *pdata) { }
|
||||
static inline void mdss_xlog_tout_handler_default(bool is_mmi, bool queue,
|
||||
const char *name, ...) { }
|
||||
-u32 get_dump_range(struct dump_offset *range_node, size_t max_offset)
|
||||
- { return 0; }
|
||||
-void mdss_dump_reg(const char *dump_name, u32 reg_dump_flag, char *addr,
|
||||
- int len, u32 **dump_mem, phys_addr_t *regs_phys, bool from_isr) { }
|
||||
-void mdss_mdp_debug_mid(u32 mid) { }
|
||||
#endif
|
||||
|
||||
int mdss_dump_misr_data(char **buf, u32 size);
|
||||
diff --git a/drivers/video/msm/mdss/mdss_debug_xlog.c b/drivers/video/msm/mdss/mdss_debug_xlog.c
|
||||
index ab4fe9c0b6f2..a74f0485b6bb 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_debug_xlog.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_debug_xlog.c
|
||||
@@ -227,6 +227,7 @@ static void mdss_xlog_dump_all(void)
|
||||
mdss_dbg_xlog.xlog_user_buf[off] = '\0';
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
u32 get_dump_range(struct dump_offset *range_node, size_t max_offset)
|
||||
{
|
||||
u32 length = 0;
|
||||
@@ -241,6 +242,7 @@ u32 get_dump_range(struct dump_offset *range_node, size_t max_offset)
|
||||
|
||||
return length;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void mdss_dump_debug_bus(u32 bus_dump_flag,
|
||||
u32 **dump_mem)
|
||||
@@ -427,6 +429,7 @@ static void mdss_dump_vbif_debug_bus(u32 bus_dump_flag,
|
||||
pr_info("========End VBIF Debug bus=========\n");
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
void mdss_dump_reg(const char *dump_name, u32 reg_dump_flag,
|
||||
char *addr, int len, u32 **dump_mem, phys_addr_t *regs_phys, bool from_isr)
|
||||
{
|
||||
@@ -492,6 +495,7 @@ void mdss_dump_reg(const char *dump_name, u32 reg_dump_flag,
|
||||
if (!from_isr)
|
||||
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void mdss_dump_reg_by_ranges(struct mdss_debug_base *dbg,
|
||||
u32 reg_dump_flag)
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_debug.c b/drivers/video/msm/mdss/mdss_mdp_debug.c
|
||||
index 0a91925b1249..2fa1338fffef 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_debug.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_debug.c
|
||||
@@ -971,6 +971,7 @@ void mdss_mdp_hw_rev_debug_caps_init(struct mdss_data_type *mdata)
|
||||
}
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
void mdss_mdp_debug_mid(u32 mid)
|
||||
{
|
||||
struct mdss_data_type *mdata = mdss_mdp_get_mdata();
|
||||
@@ -1002,6 +1003,7 @@ void mdss_mdp_debug_mid(u32 mid)
|
||||
}
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void __print_time(char *buf, u32 size, u64 ts)
|
||||
{
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
index b8c43596cdee..8e07fc5e74a0 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
@@ -4426,6 +4426,7 @@ static ssize_t mdss_mdp_cmd_autorefresh_store(struct device *dev,
|
||||
}
|
||||
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
/* Print the last CRC Value read for batch mode */
|
||||
static ssize_t mdss_mdp_misr_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
@@ -4450,6 +4451,7 @@ static ssize_t mdss_mdp_misr_show(struct device *dev,
|
||||
|
||||
return ret;
|
||||
}
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Enable crc batch mode. By enabling this mode through sysfs
|
||||
@@ -4529,8 +4531,10 @@ static ssize_t mdss_mdp_misr_store(struct device *dev,
|
||||
return len;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
static DEVICE_ATTR(msm_misr_en, S_IRUGO | S_IWUSR,
|
||||
mdss_mdp_misr_show, mdss_mdp_misr_store);
|
||||
+#endif
|
||||
static DEVICE_ATTR(msm_cmd_autorefresh_en, S_IRUGO | S_IWUSR,
|
||||
mdss_mdp_cmd_autorefresh_show, mdss_mdp_cmd_autorefresh_store);
|
||||
static DEVICE_ATTR(vsync_event, S_IRUGO, mdss_mdp_vsync_show_event, NULL);
|
||||
@@ -4552,7 +4556,9 @@ static struct attribute *mdp_overlay_sysfs_attrs[] = {
|
||||
&dev_attr_lineptr_value.attr,
|
||||
&dev_attr_ad.attr,
|
||||
&dev_attr_dyn_pu.attr,
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
&dev_attr_msm_misr_en.attr,
|
||||
+#endif
|
||||
&dev_attr_msm_cmd_autorefresh_en.attr,
|
||||
&dev_attr_hist_event.attr,
|
||||
&dev_attr_bl_event.attr,
|
||||
diff --git a/drivers/video/msm/mdss/mdss_smmu.c b/drivers/video/msm/mdss/mdss_smmu.c
|
||||
index e0d0579009a1..a0d9c64fbc6c 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_smmu.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_smmu.c
|
||||
@@ -463,7 +463,9 @@ int mdss_smmu_fault_handler(struct iommu_domain *domain, struct device *dev,
|
||||
if (i == MDSS_IOMMU_MAX_DOMAIN)
|
||||
goto end;
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
mdss_mdp_debug_mid(mid);
|
||||
+#endif
|
||||
end:
|
||||
return -ENOSYS;
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 3ed439ba8d86d7ad50623217f54f88f4562579ea Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Date: Wed, 4 Dec 2019 02:58:32 -0500
|
||||
Subject: [PATCH 4/6] Allow building qualcomm ipa_mhi without CONFIG_DEBUG_FS
|
||||
|
||||
---
|
||||
drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c b/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
|
||||
index 2e92a0e2b358..8e25ee0a09c0 100644
|
||||
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
|
||||
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
|
||||
@@ -465,6 +465,8 @@ fail:
|
||||
#else
|
||||
static void ipa_mhi_debugfs_init(void) {}
|
||||
static void ipa_mhi_debugfs_destroy(void) {}
|
||||
+static int ipa_mhi_read_write_host(enum ipa_mhi_dma_dir dir, void *dev_addr,
|
||||
+ u64 host_addr, int size) {}
|
||||
#endif /* CONFIG_DEBUG_FS */
|
||||
|
||||
static union IpaHwMhiDlUlSyncCmdData_t ipa_cached_dl_ul_sync_info;
|
||||
@@ -2314,10 +2316,12 @@ int ipa_mhi_destroy_all_channels(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
static void ipa_mhi_debugfs_destroy(void)
|
||||
{
|
||||
debugfs_remove_recursive(dent);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/**
|
||||
* ipa_mhi_destroy() - Destroy MHI IPA
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 0e30349bb61116ddf9da4bcbbd8fa2ae081640aa Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Date: Wed, 4 Dec 2019 14:42:51 -0500
|
||||
Subject: [PATCH 6/6] Allow building without CONFIG_DEBUG_FS
|
||||
|
||||
---
|
||||
drivers/scsi/ufs/ufshcd.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
|
||||
index 465012a0362d..194a3b8675bb 100644
|
||||
--- a/drivers/scsi/ufs/ufshcd.h
|
||||
+++ b/drivers/scsi/ufs/ufshcd.h
|
||||
@@ -1227,7 +1227,7 @@ static inline void ufshcd_vops_remove_debugfs(struct ufs_hba *hba)
|
||||
hba->var->vops->remove_debugfs(hba);
|
||||
}
|
||||
#else
|
||||
-static inline void ufshcd_vops_add_debugfs(struct ufs_hba *hba, struct dentry *)
|
||||
+static inline void ufshcd_vops_add_debugfs(struct ufs_hba *hba, struct dentry *root)
|
||||
{
|
||||
}
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
From c0421b8c12d27564abe4e64dac8fbd6326ad3b9b Mon Sep 17 00:00:00 2001
|
||||
From: thp1997 <tirthpatel49@gmail.com>
|
||||
Date: Sun, 21 May 2017 09:50:43 +0000
|
||||
Subject: [PATCH] Fix Kernel Compilation Issues
|
||||
|
||||
---
|
||||
drivers/net/ethernet/msm/rndis_ipa_trace.h | 2 +-
|
||||
drivers/platform/msm/ipa/ipa_v2/ipa_trace.h | 2 +-
|
||||
drivers/usb/gadget/function/f_gsi.c | 2 +-
|
||||
drivers/usb/gadget/function/f_midi.c | 2 +-
|
||||
drivers/usb/gadget/function/f_mtp.c | 2 +-
|
||||
drivers/usb/gadget/function/f_rndis.c | 2 +-
|
||||
drivers/video/msm/msm_dba/msm_dba.c | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/msm/rndis_ipa_trace.h b/drivers/net/ethernet/msm/rndis_ipa_trace.h
|
||||
index c0fc573799f2..bd9ab5b31a4a 100644
|
||||
--- a/drivers/net/ethernet/msm/rndis_ipa_trace.h
|
||||
+++ b/drivers/net/ethernet/msm/rndis_ipa_trace.h
|
||||
@@ -77,5 +77,5 @@ TRACE_EVENT(
|
||||
|
||||
/* This part must be outside protection */
|
||||
#undef TRACE_INCLUDE_PATH
|
||||
-#define TRACE_INCLUDE_PATH .
|
||||
+#define TRACE_INCLUDE_PATH ../../drivers/net/ethernet/msm
|
||||
#include <trace/define_trace.h>
|
||||
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
|
||||
index d70abdfa0469..a7629952a17f 100644
|
||||
--- a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
|
||||
+++ b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
|
||||
@@ -131,5 +131,5 @@ TRACE_EVENT(
|
||||
|
||||
/* This part must be outside protection */
|
||||
#undef TRACE_INCLUDE_PATH
|
||||
-#define TRACE_INCLUDE_PATH .
|
||||
+#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v2
|
||||
#include <trace/define_trace.h>
|
||||
diff --git a/drivers/usb/gadget/function/f_gsi.c b/drivers/usb/gadget/function/f_gsi.c
|
||||
index d1b1190d19a1..9901e0df9c39 100644
|
||||
--- a/drivers/usb/gadget/function/f_gsi.c
|
||||
+++ b/drivers/usb/gadget/function/f_gsi.c
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <linux/timer.h>
|
||||
#include "f_gsi.h"
|
||||
#include "rndis.h"
|
||||
-#include "debug.h"
|
||||
+#include "../debug.h"
|
||||
|
||||
static unsigned int gsi_in_aggr_size;
|
||||
module_param(gsi_in_aggr_size, uint, S_IRUGO | S_IWUSR);
|
||||
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
|
||||
index 7e094bbbf134..ecc1b8658ccd 100644
|
||||
--- a/drivers/usb/gadget/function/f_midi.c
|
||||
+++ b/drivers/usb/gadget/function/f_midi.c
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <linux/usb/audio.h>
|
||||
#include <linux/usb/midi.h>
|
||||
|
||||
-#include "u_f.h"
|
||||
+#include "../u_f.h"
|
||||
|
||||
MODULE_AUTHOR("Ben Williamson");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c
|
||||
index 0677e493ca66..88251dccd52d 100644
|
||||
--- a/drivers/usb/gadget/function/f_mtp.c
|
||||
+++ b/drivers/usb/gadget/function/f_mtp.c
|
||||
@@ -40,7 +40,7 @@
|
||||
#include <linux/configfs.h>
|
||||
#include <linux/usb/composite.h>
|
||||
|
||||
-#include "configfs.h"
|
||||
+#include "../configfs.h"
|
||||
|
||||
#define MTP_RX_BUFFER_INIT_SIZE 1048576
|
||||
#define MTP_BULK_BUFFER_SIZE 16384
|
||||
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
|
||||
index 545ecd304f36..3a7965535a70 100644
|
||||
--- a/drivers/usb/gadget/function/f_rndis.c
|
||||
+++ b/drivers/usb/gadget/function/f_rndis.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "u_ether_configfs.h"
|
||||
#include "u_rndis.h"
|
||||
#include "rndis.h"
|
||||
-#include "configfs.h"
|
||||
+#include "../configfs.h"
|
||||
|
||||
/*
|
||||
* This function is an RNDIS Ethernet port -- a Microsoft protocol that's
|
||||
diff --git a/drivers/video/msm/msm_dba/msm_dba.c b/drivers/video/msm/msm_dba/msm_dba.c
|
||||
index cc6512a4af9b..eb073a75fecf 100644
|
||||
--- a/drivers/video/msm/msm_dba/msm_dba.c
|
||||
+++ b/drivers/video/msm/msm_dba/msm_dba.c
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <linux/err.h>
|
||||
|
||||
#include <video/msm_dba.h>
|
||||
-#include <msm_dba_internal.h>
|
||||
+#include "msm_dba_internal.h"
|
||||
|
||||
static DEFINE_MUTEX(register_mutex);
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
From 44f841be2a223d672eaf9fa3029fd9249aeca583 Mon Sep 17 00:00:00 2001
|
||||
From: MOVZX <movzx@yahoo.com>
|
||||
Date: Tue, 25 Apr 2017 17:04:40 +0300
|
||||
Subject: [PATCH] prima: Fix GCC6 Warnings
|
||||
|
||||
Signed-off-by: MOVZX <movzx@yahoo.com>
|
||||
---
|
||||
drivers/staging/prima/CORE/MAC/src/include/utilsApi.h | 2 +-
|
||||
drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c | 2 +-
|
||||
drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c | 2 +-
|
||||
.../staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c | 5 ++---
|
||||
4 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h b/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
|
||||
index 3a175473378..798a05cd2b4 100644
|
||||
--- a/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
|
||||
+++ b/drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
|
||||
@@ -705,7 +705,7 @@ halRoundS32(tANI_S32 p)
|
||||
else
|
||||
k = p;
|
||||
|
||||
- return(k);
|
||||
+ return(k);
|
||||
}
|
||||
|
||||
// New functions for endianess conversion
|
||||
diff --git a/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c b/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
|
||||
index 0fc798995ae..6427a04e108 100644
|
||||
--- a/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
|
||||
+++ b/drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
|
||||
@@ -60,7 +60,7 @@
|
||||
// Temporarily (maybe for all of Alpha-1), assuming TIM = 0
|
||||
//
|
||||
|
||||
-const tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9};
|
||||
+tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9};
|
||||
|
||||
|
||||
tSirRetStatus schGetP2pIeOffset(tANI_U8 *pExtraIe, tANI_U32 extraIeLen, tANI_U16 *pP2pIeOffset)
|
||||
diff --git a/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c b/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
|
||||
index 23ab858c355..b4f26def1d1 100644
|
||||
--- a/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
|
||||
+++ b/drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
|
||||
@@ -5698,7 +5698,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo
|
||||
if (eHAL_STATUS_SUCCESS != status)
|
||||
smsLog(pMac, LOGE,
|
||||
FL( "failed to update the supported channel list"));
|
||||
- pMac->scan.defer_update_channel_list = false;
|
||||
+ pMac->scan.defer_update_channel_list = false;
|
||||
}
|
||||
|
||||
#ifdef WLAN_AP_STA_CONCURRENCY
|
||||
diff --git a/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c b/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c
|
||||
index 14c6eadf524..e26b697f793 100644
|
||||
--- a/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c
|
||||
+++ b/drivers/staging/prima/CORE/VOSS/src/wlan_nv_template_builtin.c
|
||||
@@ -587,9 +587,8 @@ _NV_TEMPLATE_TABLE NvTablesBuiltIn[/*TABLES_MAX*/][TABLE_ENTRIES_MAX] = {
|
||||
((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) -
|
||||
(char *)&nvDefaults.tables.hwCalValues.calData),"psSlpTimeOvrHdxLNA5G"},
|
||||
{"ed",_ID_U8,SINGULAR,0,0,0,
|
||||
- (((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) +
|
||||
- sizeof(uint16)) - (char *)&nvDefaults.tables.hwCalValues.calData),
|
||||
- "nv_TxBBFSel9MHz"},
|
||||
+ ((char *)&(nvDefaults.tables.hwCalValues.calData.psSlpTimeOvrHdxLNA5G) -
|
||||
+ (char *)&nvDefaults.tables.hwCalValues.calData),"nv_TxBBFSel9MHz"},
|
||||
{"ee",_ID_U8,SINGULAR,0,0,0,
|
||||
((char *)&(nvDefaults.tables.hwCalValues.calData.hwParam2) -
|
||||
(char *)&nvDefaults.tables.hwCalValues.calData),"hwParam2"},
|
||||
Loading…
Reference in New Issue
Block a user