41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
|
From 28c6631f59b1091df33fcdc8441bdea2aa4033a8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: anarkia1976 <stefano.villa1976@gmail.com>
|
||
|
|
Date: Mon, 30 Mar 2015 08:59:44 +0200
|
||
|
|
Subject: [PATCH] gcc5: sound/soc/codecs/wcd9xxx-mbhc.c fix warning:
|
||
|
|
initialization discards 'const' qualifier from pointer target type
|
||
|
|
|
||
|
|
---
|
||
|
|
sound/soc/codecs/wcd9xxx-mbhc.c | 2 +-
|
||
|
|
sound/soc/codecs/wcd9xxx-mbhc.h | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c
|
||
|
|
index c4ed685fe9f..267deaf8739 100644
|
||
|
|
--- a/sound/soc/codecs/wcd9xxx-mbhc.c
|
||
|
|
+++ b/sound/soc/codecs/wcd9xxx-mbhc.c
|
||
|
|
@@ -465,7 +465,7 @@ static s16 wcd9xxx_get_current_v(struct wcd9xxx_mbhc *mbhc,
|
||
|
|
}
|
||
|
|
|
||
|
|
void *wcd9xxx_mbhc_cal_btn_det_mp(
|
||
|
|
- const struct wcd9xxx_mbhc_btn_detect_cfg *btn_det,
|
||
|
|
+ struct wcd9xxx_mbhc_btn_detect_cfg *btn_det,
|
||
|
|
const enum wcd9xxx_mbhc_btn_det_mem mem)
|
||
|
|
{
|
||
|
|
void *ret = &btn_det->_v_btn_low;
|
||
|
|
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.h b/sound/soc/codecs/wcd9xxx-mbhc.h
|
||
|
|
index 91edacaeac4..dff22bc88cc 100644
|
||
|
|
--- a/sound/soc/codecs/wcd9xxx-mbhc.h
|
||
|
|
+++ b/sound/soc/codecs/wcd9xxx-mbhc.h
|
||
|
|
@@ -440,7 +440,7 @@ int wcd9xxx_mbhc_init(struct wcd9xxx_mbhc *mbhc, struct wcd9xxx_resmgr *resmgr,
|
||
|
|
bool impedance_det_en);
|
||
|
|
void wcd9xxx_mbhc_deinit(struct wcd9xxx_mbhc *mbhc);
|
||
|
|
void *wcd9xxx_mbhc_cal_btn_det_mp(
|
||
|
|
- const struct wcd9xxx_mbhc_btn_detect_cfg *btn_det,
|
||
|
|
+ struct wcd9xxx_mbhc_btn_detect_cfg *btn_det,
|
||
|
|
const enum wcd9xxx_mbhc_btn_det_mem mem);
|
||
|
|
int wcd9xxx_mbhc_get_impedance(struct wcd9xxx_mbhc *mbhc, uint32_t *zl,
|
||
|
|
uint32_t *zr);
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|