Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

[linux-2.6-block.git] / drivers / i2c / busses / i2c-bcm-iproc.c

diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
index 19ef2b0c682a9992b2ef74c669d7f45e80254eb5..9ffdffaf6141e5916bd75a658bec3fc52a7f4c4b 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -808,7 +808,7 @@ static struct i2c_algorithm bcm_iproc_algo = {
        .unreg_slave = bcm_iproc_i2c_unreg_slave,
 };
 
-static struct i2c_adapter_quirks bcm_iproc_i2c_quirks = {
+static const struct i2c_adapter_quirks bcm_iproc_i2c_quirks = {
        .max_read_len = M_RX_MAX_READ_LEN,
 };
 
@@ -922,7 +922,9 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
 
        adap = &iproc_i2c->adapter;
        i2c_set_adapdata(adap, iproc_i2c);
-       strlcpy(adap->name, "Broadcom iProc I2C adapter", sizeof(adap->name));
+       snprintf(adap->name, sizeof(adap->name),
+               "Broadcom iProc (%s)",
+               of_node_full_name(iproc_i2c->device->of_node));
        adap->algo = &bcm_iproc_algo;
        adap->quirks = &bcm_iproc_i2c_quirks;
        adap->dev.parent = &pdev->dev;