| Message ID | 1390428412-2269-1-git-send-email-shane.huang@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 22 Jan 2014 14:06:52 -0800, Shane Huang wrote: > Same messages for AMD main and auxiliary SMBus controllers lead to confusion, > this patch is to remove confusion and keep consistent with non-AMD products. > > Signed-off-by: Shane Huang <shane.huang@amd.com> > --- > drivers/i2c/busses/i2c-piix4.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c > index f71b4d3..d82b8ab 100644 > --- a/drivers/i2c/busses/i2c-piix4.c > +++ b/drivers/i2c/busses/i2c-piix4.c > @@ -295,7 +295,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, > /* Aux SMBus does not support IRQ information */ > if (aux) { > dev_info(&PIIX4_dev->dev, > - "SMBus Host Controller at 0x%x\n", piix4_smba); > + "Auxiliary SMBus Host Controller at 0x%x\n", > + piix4_smba); > return piix4_smba; > } > I like it very much, as it makes all these messages consistent across devices. And this allows string re-use for a small gain in size. Reviewed-by: Jean Delvare <khali@linux-fr.org> Wolfram, please apply.
On Wed, Jan 22, 2014 at 02:06:52PM -0800, Shane Huang wrote: > Same messages for AMD main and auxiliary SMBus controllers lead to confusion, > this patch is to remove confusion and keep consistent with non-AMD products. > > Signed-off-by: Shane Huang <shane.huang@amd.com> Applied to for-current, thanks!
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index f71b4d3..d82b8ab 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -295,7 +295,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, /* Aux SMBus does not support IRQ information */ if (aux) { dev_info(&PIIX4_dev->dev, - "SMBus Host Controller at 0x%x\n", piix4_smba); + "Auxiliary SMBus Host Controller at 0x%x\n", + piix4_smba); return piix4_smba; }
Same messages for AMD main and auxiliary SMBus controllers lead to confusion, this patch is to remove confusion and keep consistent with non-AMD products. Signed-off-by: Shane Huang <shane.huang@amd.com> --- drivers/i2c/busses/i2c-piix4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)