[PATCH] i2c: brcmstb: Fixed adapter named with optional interrupts

Wolfram Sang wsa at kernel.org
Sat Jul 16 05:40:07 PDT 2022


On Wed, Jul 06, 2022 at 10:21:15AM -0700, Florian Fainelli wrote:
> When the adapter is registered without interrupts, we would be showing
> the following:
> 
>   # i2cdetect -l
>   i2c-3   i2c             Broadcom STB :                          I2C adapter

What about switching to pdev->name here? That way you also get the base
address for free to differentiate if there are multiple instances on the
SoC?

> 
> which is visually disturbing, only add the separator if we do have an
> interrupt.
> 
> Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c controller driver")
> Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
> ---
>  drivers/i2c/busses/i2c-brcmstb.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
> index b00f35c0b066..538a51299e04 100644
> --- a/drivers/i2c/busses/i2c-brcmstb.c
> +++ b/drivers/i2c/busses/i2c-brcmstb.c
> @@ -684,9 +684,11 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
>  	adap = &dev->adapter;
>  	i2c_set_adapdata(adap, dev);
>  	adap->owner = THIS_MODULE;
> -	strlcpy(adap->name, "Broadcom STB : ", sizeof(adap->name));
> -	if (int_name)
> +	strlcpy(adap->name, "Broadcom STB", sizeof(adap->name));
> +	if (int_name) {
> +		strlcat(adap->name, ": ", sizeof(adap->name));
>  		strlcat(adap->name, int_name, sizeof(adap->name));
> +	}
>  	adap->algo = &brcmstb_i2c_algo;
>  	adap->dev.parent = &pdev->dev;
>  	adap->dev.of_node = pdev->dev.of_node;
> -- 
> 2.25.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20220716/19284075/attachment.sig>


More information about the linux-arm-kernel mailing list