leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Use more idiomatic driver name for WM8731

Browse Source 
Make dev_() prints much prettier.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown 2010-05-07 18:39:25 +01:00
parent 06ae99888e
commit 896060c76b
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/mfd/wm831x-irq.c
View File

@ -21,6 +21,7 @@
#include <linux/mfd/wm831x/core.h> #include <linux/mfd/wm831x/core.h>
#include <linux/mfd/wm831x/pdata.h> #include <linux/mfd/wm831x/pdata.h>
#include <linux/mfd/wm831x/gpio.h>
#include <linux/mfd/wm831x/irq.h> #include <linux/mfd/wm831x/irq.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -388,12 +389,41 @@ static void wm831x_irq_mask(unsigned int irq)
wm831x->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask; wm831x->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask;
} }
static int wm831x_irq_set_type(unsigned int irq, unsigned int type)
{
struct wm831x *wm831x = get_irq_chip_data(irq);
int val;
irq = irq - wm831x->irq_base;
if (irq < WM831X_IRQ_GPIO_1 || irq > WM831X_IRQ_GPIO_11)
return -EINVAL;
switch (type) {
case IRQ_TYPE_EDGE_BOTH:
val = WM831X_GPN_INT_MODE;
break;
case IRQ_TYPE_EDGE_RISING:
val = WM831X_GPN_POL;
break;
case IRQ_TYPE_EDGE_FALLING:
val = 0;
break;
default:
return -EINVAL;
}
return wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + irq,
WM831X_GPN_INT_MODE | WM831X_GPN_POL, val);
}
static struct irq_chip wm831x_irq_chip = { static struct irq_chip wm831x_irq_chip = {
.name = "wm831x", .name = "wm831x",
.bus_lock = wm831x_irq_lock, .bus_lock = wm831x_irq_lock,
.bus_sync_unlock = wm831x_irq_sync_unlock, .bus_sync_unlock = wm831x_irq_sync_unlock,
.mask = wm831x_irq_mask, .mask = wm831x_irq_mask,
.unmask = wm831x_irq_unmask, .unmask = wm831x_irq_unmask,
.set_type = wm831x_irq_set_type,
}; };
/* The processing of the primary interrupt occurs in a thread so that /* The processing of the primary interrupt occurs in a thread so that

2
sound/soc/codecs/wm8731.c
View File

@ -707,7 +707,7 @@ MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);
static struct i2c_driver wm8731_i2c_driver = { static struct i2c_driver wm8731_i2c_driver = {
.driver = { .driver = {
.name = "WM8731 I2C Codec", .name = "wm8731",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = wm8731_i2c_probe, .probe = wm8731_i2c_probe,