[PATCH 5/7] soc: aspeed: lpc-snoop: Rename 'channel' to 'index' in channel paths

Andrew Jeffery
2025-04-11T01:09:14Z

We'll introduce another 'channel' variable shortly

Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
drivers/soc/aspeed/aspeed-lpc-snoop.c | 47 ++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c
index 6ab362aeb180c8ad356422d8257717f41a232b3c..f6952f71eda52c95aea5ad1084edd218b88f1234 100644
--- a/drivers/soc/aspeed/aspeed-lpc-snoop.c
+++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c
@@ -185,40 +185,40 @@ static int aspeed_lpc_snoop_config_irq(struct aspeed_lpc_snoop *lpc_snoop,
__attribute__((nonnull))
static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
struct device *dev,
- int channel, u16 lpc_port)
+ int index, u16 lpc_port)
{
const struct aspeed_lpc_snoop_model_data *model_data;
u32 hicr5_en, snpwadr_mask, snpwadr_shift, hicrb_en;
int rc = 0;

- if (channel < 0 || channel >= ARRAY_SIZE(lpc_snoop->chan))
+ if (index < 0 || index >= ARRAY_SIZE(lpc_snoop->chan))
return -EINVAL;

- if (lpc_snoop->chan[channel].enabled)
+ if (lpc_snoop->chan[index].enabled)
return -EBUSY;

- init_waitqueue_head(&lpc_snoop->chan[channel].wq);
+ init_waitqueue_head(&lpc_snoop->chan[index].wq);
/* Create FIFO datastructure */
- rc = kfifo_alloc(&lpc_snoop->chan[channel].fifo,
+ rc = kfifo_alloc(&lpc_snoop->chan[index].fifo,
SNOOP_FIFO_SIZE, GFP_KERNEL);
if (rc)
return rc;

- lpc_snoop->chan[channel].miscdev.minor = MISC_DYNAMIC_MINOR;
- lpc_snoop->chan[channel].miscdev.name =
- devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, channel);
- if (!lpc_snoop->chan[channel].miscdev.name) {
+ lpc_snoop->chan[index].miscdev.minor = MISC_DYNAMIC_MINOR;
+ lpc_snoop->chan[index].miscdev.name =
+ devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, index);
+ if (!lpc_snoop->chan[index].miscdev.name) {
rc = -ENOMEM;
goto err_free_fifo;
}
- lpc_snoop->chan[channel].miscdev.fops = &snoop_fops;
- lpc_snoop->chan[channel].miscdev.parent = dev;
- rc = misc_register(&lpc_snoop->chan[channel].miscdev);
+ lpc_snoop->chan[index].miscdev.fops = &snoop_fops;
+ lpc_snoop->chan[index].miscdev.parent = dev;
+ rc = misc_register(&lpc_snoop->chan[index].miscdev);
if (rc)
goto err_free_fifo;

/* Enable LPC snoop channel at requested port */
- switch (channel) {
+ switch (index) {
case 0:
hicr5_en = HICR5_EN_SNP0W | HICR5_ENINT_SNP0W;
snpwadr_mask = SNPWADR_CH0_MASK;
@@ -244,28 +244,29 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
if (model_data && model_data->has_hicrb_ensnp)
regmap_update_bits(lpc_snoop->regmap, HICRB, hicrb_en, hicrb_en);

- lpc_snoop->chan[channel].enabled = true;
+ lpc_snoop->chan[index].enabled = true;

return 0;

err_misc_deregister:
- misc_deregister(&lpc_snoop->chan[channel].miscdev);
+ misc_deregister(&lpc_snoop->chan[index].miscdev);
err_free_fifo:
- kfifo_free(&lpc_snoop->chan[channel].fifo);
+ kfifo_free(&lpc_snoop->chan[index].fifo);
return rc;
}

__attribute__((nonnull))
static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
- int channel)
+ int index)
{
- if (channel < 0 || channel >= ARRAY_SIZE(lpc_snoop->chan))
+ if (index < 0 || index >= ARRAY_SIZE(lpc_snoop->chan))
return;

- if (!lpc_snoop->chan[channel].enabled)
+ if (!lpc_snoop->chan[index].enabled)
return;

- switch (channel) {
+ /* Disable interrupts along with the device */
+ switch (index) {
case 0:
regmap_update_bits(lpc_snoop->regmap, HICR5,
HICR5_EN_SNP0W | HICR5_ENINT_SNP0W,
@@ -280,10 +281,10 @@ static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
return;
}

- lpc_snoop->chan[channel].enabled = false;
+ lpc_snoop->chan[index].enabled = false;
/* Consider improving safety wrt concurrent reader(s) */
- misc_deregister(&lpc_snoop->chan[channel].miscdev);
- kfifo_free(&lpc_snoop->chan[channel].fifo);
+ misc_deregister(&lpc_snoop->chan[index].miscdev);
+ kfifo_free(&lpc_snoop->chan[index].fifo);
}

static int aspeed_lpc_snoop_probe(struct platform_device *pdev)

--
2.39.5