hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regmap: mmio: Remove mmio_relaxed member from context

Browse Source 
There is no need to keep mmio_relaxed member in the context, it's
onetime used during generation of the context. Remove it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: William Breathitt Gray <william.gray@linaro.org>
Link: https://lore.kernel.org/r/20220808203401.35153-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2022-08-08 23:33:57 +03:00 committed by Mark Brown
parent 568035b01c
commit ada79bca38
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/regmap/regmap-mmio.c
View File

@ -16,7 +16,6 @@
struct regmap_mmio_context { struct regmap_mmio_context {
void __iomem *regs; void __iomem *regs;
unsigned int val_bytes; unsigned int val_bytes;
bool relaxed_mmio;
bool attached_clk; bool attached_clk;
struct clk *clk; struct clk *clk;
@ -290,7 +289,6 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
ctx->regs = regs; ctx->regs = regs;
ctx->val_bytes = config->val_bits / 8; ctx->val_bytes = config->val_bits / 8;
ctx->relaxed_mmio = config->use_relaxed_mmio;
ctx->clk = ERR_PTR(-ENODEV); ctx->clk = ERR_PTR(-ENODEV);
switch (regmap_get_val_endian(dev, &regmap_mmio, config)) { switch (regmap_get_val_endian(dev, &regmap_mmio, config)) {
@ -301,7 +299,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
#endif #endif
switch (config->val_bits) { switch (config->val_bits) {
case 8: case 8:
if (ctx->relaxed_mmio) { if (config->use_relaxed_mmio) {
ctx->reg_read = regmap_mmio_read8_relaxed; ctx->reg_read = regmap_mmio_read8_relaxed;
ctx->reg_write = regmap_mmio_write8_relaxed; ctx->reg_write = regmap_mmio_write8_relaxed;
} else { } else {
@ -310,7 +308,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
} }
break; break;
case 16: case 16:
if (ctx->relaxed_mmio) { if (config->use_relaxed_mmio) {
ctx->reg_read = regmap_mmio_read16le_relaxed; ctx->reg_read = regmap_mmio_read16le_relaxed;
ctx->reg_write = regmap_mmio_write16le_relaxed; ctx->reg_write = regmap_mmio_write16le_relaxed;
} else { } else {
@ -319,7 +317,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
} }
break; break;
case 32: case 32:
if (ctx->relaxed_mmio) { if (config->use_relaxed_mmio) {
ctx->reg_read = regmap_mmio_read32le_relaxed; ctx->reg_read = regmap_mmio_read32le_relaxed;
ctx->reg_write = regmap_mmio_write32le_relaxed; ctx->reg_write = regmap_mmio_write32le_relaxed;
} else { } else {
@ -329,7 +327,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
break; break;
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
case 64: case 64:
if (ctx->relaxed_mmio) { if (config->use_relaxed_mmio) {
ctx->reg_read = regmap_mmio_read64le_relaxed; ctx->reg_read = regmap_mmio_read64le_relaxed;
ctx->reg_write = regmap_mmio_write64le_relaxed; ctx->reg_write = regmap_mmio_write64le_relaxed;
} else { } else {