From 591b6f96bb9d05455954de455a6a0f795674d4ce Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 10 Apr 2013 00:36:37 +0000 Subject: [PATCH] --- yaml --- r: 371003 b: refs/heads/master c: ca0c1ff528a332e6f83d4566c2c8eb05b108c83c h: refs/heads/master i: 371001: 0406b6c47047e25dee7bb9cf59476f6c21b38e6f 370999: 9af71a407a8c9287cae28d1f8bed6c68dd5fa9b9 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-designware-pcidrv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3aadb639d68..0d21934b0c66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cb715ca46946b1ad32735d11830a84a433f2b1b +refs/heads/master: ca0c1ff528a332e6f83d4566c2c8eb05b108c83c diff --git a/trunk/drivers/i2c/busses/i2c-designware-pcidrv.c b/trunk/drivers/i2c/busses/i2c-designware-pcidrv.c index 7c5e383c350d..eed149d0b68d 100644 --- a/trunk/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/trunk/drivers/i2c/busses/i2c-designware-pcidrv.c @@ -208,7 +208,7 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev) } static int i2c_dw_pci_probe(struct pci_dev *pdev, -const struct pci_device_id *id) + const struct pci_device_id *id) { struct dw_i2c_dev *dev; struct i2c_adapter *adap; @@ -218,7 +218,7 @@ const struct pci_device_id *id) struct dw_pci_controller *controller; if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) { - printk(KERN_ERR "dw_i2c_pci_probe: invalid driver data %ld\n", + dev_err(&pdev->dev, "%s: invalid driver data %ld\n", __func__, id->driver_data); return -EINVAL; }