renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 06:04:05 +08:00
Code

coresight: tmc: re-implementing tmc_read_prepare/unprepare() functions

Browse Source 
In their current implementation the tmc_read_prepare/unprepare()
are a lump of if/else that is difficult to read.  This patch is
alleviating that by using a switch statement.  The latter also
allows for a better control on the error path.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2016-05-03 11:33:46 -06:00 committed by Greg Kroah-Hartman
parent 358f42184e
commit b1789b793e
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/hwtracing/coresight/coresight-tmc.c
View File

@ -431,7 +431,7 @@ static const struct coresight_ops tmc_etf_cs_ops = {
static int tmc_read_prepare(struct tmc_drvdata *drvdata) static int tmc_read_prepare(struct tmc_drvdata *drvdata)
{ {
int ret; int ret = 0;
unsigned long flags; unsigned long flags;
enum tmc_mode mode; enum tmc_mode mode;
@ -439,25 +439,31 @@ static int tmc_read_prepare(struct tmc_drvdata *drvdata)
if (!drvdata->enable) if (!drvdata->enable)
goto out; goto out;
if (drvdata->config_type == TMC_CONFIG_TYPE_ETB) { switch (drvdata->config_type) {
case TMC_CONFIG_TYPE_ETB:
tmc_etb_disable_hw(drvdata); tmc_etb_disable_hw(drvdata);
} else if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { break;
tmc_etr_disable_hw(drvdata); case TMC_CONFIG_TYPE_ETF:
} else { /* There is no point in reading a TMC in HW FIFO mode */
mode = readl_relaxed(drvdata->base + TMC_MODE); mode = readl_relaxed(drvdata->base + TMC_MODE);
if (mode == TMC_MODE_CIRCULAR_BUFFER) { if (mode != TMC_MODE_CIRCULAR_BUFFER) {
tmc_etb_disable_hw(drvdata); ret = -EINVAL;
} else {
ret = -ENODEV;
goto err; goto err;
} }
tmc_etb_disable_hw(drvdata);
break;
case TMC_CONFIG_TYPE_ETR:
tmc_etr_disable_hw(drvdata);
break;
default:
ret = -EINVAL;
goto err;
} }
out: out:
drvdata->reading = true; drvdata->reading = true;
spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_info(drvdata->dev, "TMC read start\n"); dev_info(drvdata->dev, "TMC read start\n");
return 0;
err: err:
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
return ret; return ret;
@ -472,20 +478,30 @@ static void tmc_read_unprepare(struct tmc_drvdata *drvdata)
if (!drvdata->enable) if (!drvdata->enable)
goto out; goto out;
if (drvdata->config_type == TMC_CONFIG_TYPE_ETB) { switch (drvdata->config_type) {
case TMC_CONFIG_TYPE_ETB:
tmc_etb_enable_hw(drvdata); tmc_etb_enable_hw(drvdata);
} else if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { break;
tmc_etr_enable_hw(drvdata); case TMC_CONFIG_TYPE_ETF:
} else { /* Make sure we don't re-enable a TMC in HW FIFO mode */
mode = readl_relaxed(drvdata->base + TMC_MODE); mode = readl_relaxed(drvdata->base + TMC_MODE);
if (mode == TMC_MODE_CIRCULAR_BUFFER) if (mode != TMC_MODE_CIRCULAR_BUFFER)
goto err;
tmc_etb_enable_hw(drvdata); tmc_etb_enable_hw(drvdata);
break;
case TMC_CONFIG_TYPE_ETR:
tmc_etr_disable_hw(drvdata);
break;
default:
goto err;
} }
out: out:
drvdata->reading = false; drvdata->reading = false;
spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_info(drvdata->dev, "TMC read end\n"); dev_info(drvdata->dev, "TMC read end\n");
err:
spin_unlock_irqrestore(&drvdata->spinlock, flags);
} }
static int tmc_open(struct inode *inode, struct file *file) static int tmc_open(struct inode *inode, struct file *file)