aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/asic3.c6
-rw-r--r--drivers/mfd/sm501.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index f6f2d960cadb..ef8a492766a7 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -132,7 +132,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
132 132
133 if (iter >= MAX_ASIC_ISR_LOOPS) 133 if (iter >= MAX_ASIC_ISR_LOOPS)
134 printk(KERN_ERR "%s: interrupt processing overrun\n", 134 printk(KERN_ERR "%s: interrupt processing overrun\n",
135 __FUNCTION__); 135 __func__);
136} 136}
137 137
138static inline int asic3_irq_to_bank(struct asic3 *asic, int irq) 138static inline int asic3_irq_to_bank(struct asic3 *asic, int irq)
@@ -409,7 +409,7 @@ int asic3_gpio_get_value(struct asic3 *asic, unsigned gpio)
409 return asic3_get_gpio_d(asic, Status) & mask; 409 return asic3_get_gpio_d(asic, Status) & mask;
410 default: 410 default:
411 printk(KERN_ERR "%s: invalid GPIO value 0x%x", 411 printk(KERN_ERR "%s: invalid GPIO value 0x%x",
412 __FUNCTION__, gpio); 412 __func__, gpio);
413 return -EINVAL; 413 return -EINVAL;
414 } 414 }
415} 415}
@@ -437,7 +437,7 @@ void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
437 return; 437 return;
438 default: 438 default:
439 printk(KERN_ERR "%s: invalid GPIO value 0x%x", 439 printk(KERN_ERR "%s: invalid GPIO value 0x%x",
440 __FUNCTION__, gpio); 440 __func__, gpio);
441 return; 441 return;
442 } 442 }
443} 443}
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 6e655b4c6682..2fe64734d8af 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -349,11 +349,11 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to)
349 mode &= 3; /* get current power mode */ 349 mode &= 3; /* get current power mode */
350 350
351 if (unit >= ARRAY_SIZE(sm->unit_power)) { 351 if (unit >= ARRAY_SIZE(sm->unit_power)) {
352 dev_err(dev, "%s: bad unit %d\n", __FUNCTION__, unit); 352 dev_err(dev, "%s: bad unit %d\n", __func__, unit);
353 goto already; 353 goto already;
354 } 354 }
355 355
356 dev_dbg(sm->dev, "%s: unit %d, cur %d, to %d\n", __FUNCTION__, unit, 356 dev_dbg(sm->dev, "%s: unit %d, cur %d, to %d\n", __func__, unit,
357 sm->unit_power[unit], to); 357 sm->unit_power[unit], to);
358 358
359 if (to == 0 && sm->unit_power[unit] == 0) { 359 if (to == 0 && sm->unit_power[unit] == 0) {