soundwire: intel: rename res field as link_res

There are too many fields called 'res' so add prefix to make it easier
to track what the structures are.

Pure rename, no functionality change

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Sanyog Kale <sanyog.r.kale@intel.com>
Link: https://lore.kernel.org/r/20200215014740.27580-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 06ef3a3ac080ce485b9225a6f15d170836ad596c..78b2ebf0119c99706a855873a5efc6fe9521e688 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -103,7 +103,7 @@ enum intel_pdi_type {
 struct sdw_intel {
        struct sdw_cdns cdns;
        int instance;
-       struct sdw_intel_link_res *res;
+       struct sdw_intel_link_res *link_res;
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs;
 #endif
@@ -193,8 +193,8 @@ static ssize_t intel_sprintf(void __iomem *mem, bool l,
 static int intel_reg_show(struct seq_file *s_file, void *data)
 {
        struct sdw_intel *sdw = s_file->private;
-       void __iomem *s = sdw->res->shim;
-       void __iomem *a = sdw->res->alh;
+       void __iomem *s = sdw->link_res->shim;
+       void __iomem *a = sdw->link_res->alh;
        char *buf;
        ssize_t ret;
        int i, j;
@@ -289,7 +289,7 @@ static void intel_debugfs_exit(struct sdw_intel *sdw) {}
 static int intel_link_power_up(struct sdw_intel *sdw)
 {
        unsigned int link_id = sdw->instance;
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        int spa_mask, cpa_mask;
        int link_control, ret;
 
@@ -309,7 +309,7 @@ static int intel_link_power_up(struct sdw_intel *sdw)
 
 static int intel_shim_init(struct sdw_intel *sdw)
 {
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        unsigned int link_id = sdw->instance;
        int sync_reg, ret;
        u16 ioctl = 0, act = 0;
@@ -370,7 +370,7 @@ static int intel_shim_init(struct sdw_intel *sdw)
 static void intel_pdi_init(struct sdw_intel *sdw,
                           struct sdw_cdns_stream_config *config)
 {
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        unsigned int link_id = sdw->instance;
        int pcm_cap, pdm_cap;
 
@@ -404,7 +404,7 @@ static void intel_pdi_init(struct sdw_intel *sdw,
 static int
 intel_pdi_get_ch_cap(struct sdw_intel *sdw, unsigned int pdi_num, bool pcm)
 {
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        unsigned int link_id = sdw->instance;
        int count;
 
@@ -476,7 +476,7 @@ static int intel_pdi_ch_update(struct sdw_intel *sdw)
 static void
 intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
 {
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        unsigned int link_id = sdw->instance;
        int pdi_conf = 0;
 
@@ -508,7 +508,7 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
 static void
 intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
 {
-       void __iomem *alh = sdw->res->alh;
+       void __iomem *alh = sdw->link_res->alh;
        unsigned int link_id = sdw->instance;
        unsigned int conf;
 
@@ -535,7 +535,7 @@ static int intel_params_stream(struct sdw_intel *sdw,
                               struct snd_pcm_hw_params *hw_params,
                               int link_id, int alh_stream_id)
 {
-       struct sdw_intel_link_res *res = sdw->res;
+       struct sdw_intel_link_res *res = sdw->link_res;
        struct sdw_intel_stream_params_data params_data;
 
        params_data.substream = substream;
@@ -558,7 +558,7 @@ static int intel_pre_bank_switch(struct sdw_bus *bus)
 {
        struct sdw_cdns *cdns = bus_to_cdns(bus);
        struct sdw_intel *sdw = cdns_to_intel(cdns);
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        int sync_reg;
 
        /* Write to register only for multi-link */
@@ -577,7 +577,7 @@ static int intel_post_bank_switch(struct sdw_bus *bus)
 {
        struct sdw_cdns *cdns = bus_to_cdns(bus);
        struct sdw_intel *sdw = cdns_to_intel(cdns);
-       void __iomem *shim = sdw->res->shim;
+       void __iomem *shim = sdw->link_res->shim;
        int sync_reg, ret;
 
        /* Write to register only for multi-link */
@@ -937,9 +937,9 @@ static int intel_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        sdw->instance = pdev->id;
-       sdw->res = dev_get_platdata(&pdev->dev);
+       sdw->link_res = dev_get_platdata(&pdev->dev);
        sdw->cdns.dev = &pdev->dev;
-       sdw->cdns.registers = sdw->res->registers;
+       sdw->cdns.registers = sdw->link_res->registers;
        sdw->cdns.instance = sdw->instance;
        sdw->cdns.msg_count = 0;
        sdw->cdns.bus.dev = &pdev->dev;
@@ -979,11 +979,12 @@ static int intel_probe(struct platform_device *pdev)
        intel_pdi_ch_update(sdw);
 
        /* Acquire IRQ */
-       ret = request_threaded_irq(sdw->res->irq, sdw_cdns_irq, sdw_cdns_thread,
+       ret = request_threaded_irq(sdw->link_res->irq,
+                                  sdw_cdns_irq, sdw_cdns_thread,
                                   IRQF_SHARED, KBUILD_MODNAME, &sdw->cdns);
        if (ret < 0) {
                dev_err(sdw->cdns.dev, "unable to grab IRQ %d, disabling device\n",
-                       sdw->res->irq);
+                       sdw->link_res->irq);
                goto err_init;
        }
 
@@ -1013,7 +1014,7 @@ static int intel_probe(struct platform_device *pdev)
 
 err_interrupt:
        sdw_cdns_enable_interrupt(&sdw->cdns, false);
-       free_irq(sdw->res->irq, sdw);
+       free_irq(sdw->link_res->irq, sdw);
 err_init:
        sdw_delete_bus_master(&sdw->cdns.bus);
        return ret;
@@ -1028,7 +1029,7 @@ static int intel_remove(struct platform_device *pdev)
        if (!sdw->cdns.bus.prop.hw_disabled) {
                intel_debugfs_exit(sdw);
                sdw_cdns_enable_interrupt(&sdw->cdns, false);
-               free_irq(sdw->res->irq, sdw);
+               free_irq(sdw->link_res->irq, sdw);
                snd_soc_unregister_component(sdw->cdns.dev);
        }
        sdw_delete_bus_master(&sdw->cdns.bus);