diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-davinci.c')
-rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index fde26345a379..7ecbfc429b19 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
@@ -328,7 +328,7 @@ i2c_davinci_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) | |||
328 | int i; | 328 | int i; |
329 | int ret; | 329 | int ret; |
330 | 330 | ||
331 | dev_dbg(dev->dev, "%s: msgs: %d\n", __FUNCTION__, num); | 331 | dev_dbg(dev->dev, "%s: msgs: %d\n", __func__, num); |
332 | 332 | ||
333 | ret = i2c_davinci_wait_bus_not_busy(dev, 1); | 333 | ret = i2c_davinci_wait_bus_not_busy(dev, 1); |
334 | if (ret < 0) { | 334 | if (ret < 0) { |
@@ -342,7 +342,7 @@ i2c_davinci_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) | |||
342 | return ret; | 342 | return ret; |
343 | } | 343 | } |
344 | 344 | ||
345 | dev_dbg(dev->dev, "%s:%d ret: %d\n", __FUNCTION__, __LINE__, ret); | 345 | dev_dbg(dev->dev, "%s:%d ret: %d\n", __func__, __LINE__, ret); |
346 | 346 | ||
347 | return num; | 347 | return num; |
348 | } | 348 | } |
@@ -364,7 +364,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) | |||
364 | u16 w; | 364 | u16 w; |
365 | 365 | ||
366 | while ((stat = davinci_i2c_read_reg(dev, DAVINCI_I2C_IVR_REG))) { | 366 | while ((stat = davinci_i2c_read_reg(dev, DAVINCI_I2C_IVR_REG))) { |
367 | dev_dbg(dev->dev, "%s: stat=0x%x\n", __FUNCTION__, stat); | 367 | dev_dbg(dev->dev, "%s: stat=0x%x\n", __func__, stat); |
368 | if (count++ == 100) { | 368 | if (count++ == 100) { |
369 | dev_warn(dev->dev, "Too much work in one IRQ\n"); | 369 | dev_warn(dev->dev, "Too much work in one IRQ\n"); |
370 | break; | 370 | break; |
@@ -553,6 +553,9 @@ static int davinci_i2c_remove(struct platform_device *pdev) | |||
553 | return 0; | 553 | return 0; |
554 | } | 554 | } |
555 | 555 | ||
556 | /* work with hotplug and coldplug */ | ||
557 | MODULE_ALIAS("platform:i2c_davinci"); | ||
558 | |||
556 | static struct platform_driver davinci_i2c_driver = { | 559 | static struct platform_driver davinci_i2c_driver = { |
557 | .probe = davinci_i2c_probe, | 560 | .probe = davinci_i2c_probe, |
558 | .remove = davinci_i2c_remove, | 561 | .remove = davinci_i2c_remove, |