samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio_kernel: Fix compilation issues during kernel upgrade

Browse Source 
Updated WCD937x, WSA881x-analog and bolero drivers for successful
compilation on kernel6.0 for holi.

Change-Id: Ia91a999f825570b3d7123842f0aad3740c4d25ed
This commit is contained in:
karishma Tekade
2023-03-16 14:12:30 +05:30
committed by Gerrit - the friendly Code Review server
parent e7118564d5
commit b6e311a3d8
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
asoc/codecs/bolero/bolero-clk-rsc.c
View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/of_platform.h> #include <linux/of_platform.h>
@@ -106,7 +107,7 @@ int bolero_rsc_clk_reset(struct device *dev, int clk_id)
int count = 0; int count = 0;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return -EINVAL; return -EINVAL;
} }
@@ -153,7 +154,7 @@ void bolero_clk_rsc_enable_all_clocks(struct device *dev, bool enable)
int i = 0; int i = 0;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return; return;
} }
@@ -455,7 +456,7 @@ void bolero_clk_rsc_fs_gen_request(struct device *dev, bool enable)
struct bolero_clk_rsc *priv = NULL; struct bolero_clk_rsc *priv = NULL;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return; return;
} }
clk_dev = bolero_get_rsc_clk_device_ptr(dev->parent); clk_dev = bolero_get_rsc_clk_device_ptr(dev->parent);
@@ -531,7 +532,7 @@ int bolero_clk_rsc_request_clock(struct device *dev,
bool mux_switch = false; bool mux_switch = false;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return -EINVAL; return -EINVAL;
} }
if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) && if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) &&

1
asoc/codecs/wcd937x/wcd937x.c
View File

@@ -107,7 +107,6 @@ static struct regmap_irq_chip wcd937x_regmap_irq_chip = {
//#if IS_ENABLED(CONFIG_AUDIO_QGKI) //#if IS_ENABLED(CONFIG_AUDIO_QGKI)
.clear_ack = 1, .clear_ack = 1,
//#endif //#endif
.mask_writeonly = 1,
.type_base = WCD937X_DIGITAL_INTR_LEVEL_0, .type_base = WCD937X_DIGITAL_INTR_LEVEL_0,
.runtime_pm = false, .runtime_pm = false,
.handle_post_irq = wcd937x_handle_post_irq, .handle_post_irq = wcd937x_handle_post_irq,

3
asoc/codecs/wsa881x-analog.c
View File

@@ -1584,7 +1584,7 @@ err:
return ret; return ret;
} }
static int wsa881x_i2c_remove(struct i2c_client *client) static void wsa881x_i2c_remove(struct i2c_client *client)
{ {
struct wsa881x_pdata *wsa881x = client->dev.platform_data; struct wsa881x_pdata *wsa881x = client->dev.platform_data;
@@ -1601,7 +1601,6 @@ static int wsa881x_i2c_remove(struct i2c_client *client)
} }
i2c_set_clientdata(client, NULL); i2c_set_clientdata(client, NULL);
kfree(wsa881x); kfree(wsa881x);
return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP