Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 231020
b: refs/heads/master
c: 25a947f
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Jan 14, 2011
1 parent 2eb7a0c commit 14071bf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 845aeab5f1e0ef1a85b618a1bf917520a62a9c02
refs/heads/master: 25a947f805b4132b69f2561589e17a0fe45552b6
10 changes: 5 additions & 5 deletions trunk/drivers/mfd/wm831x-irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,14 @@ static inline struct wm831x_irq_data *irq_to_wm831x_irq(struct wm831x *wm831x,

static void wm831x_irq_lock(struct irq_data *data)
{
struct wm831x *wm831x = data->chip_data;
struct wm831x *wm831x = irq_data_get_irq_chip_data(data);

mutex_lock(&wm831x->irq_lock);
}

static void wm831x_irq_sync_unlock(struct irq_data *data)
{
struct wm831x *wm831x = data->chip_data;
struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
int i;

for (i = 0; i < ARRAY_SIZE(wm831x->irq_masks_cur); i++) {
Expand All @@ -373,7 +373,7 @@ static void wm831x_irq_sync_unlock(struct irq_data *data)

static void wm831x_irq_unmask(struct irq_data *data)
{
struct wm831x *wm831x = data->chip_data;
struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x,
data->irq);

Expand All @@ -382,7 +382,7 @@ static void wm831x_irq_unmask(struct irq_data *data)

static void wm831x_irq_mask(struct irq_data *data)
{
struct wm831x *wm831x = data->chip_data;
struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x,
data->irq);

Expand All @@ -391,7 +391,7 @@ static void wm831x_irq_mask(struct irq_data *data)

static int wm831x_irq_set_type(struct irq_data *data, unsigned int type)
{
struct wm831x *wm831x = data->chip_data;
struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
int val, irq;

irq = data->irq - wm831x->irq_base;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/mfd/wm8350-irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,14 +419,14 @@ static irqreturn_t wm8350_irq(int irq, void *irq_data)

static void wm8350_irq_lock(struct irq_data *data)
{
struct wm8350 *wm8350 = data->chip_data;
struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);

mutex_lock(&wm8350->irq_lock);
}

static void wm8350_irq_sync_unlock(struct irq_data *data)
{
struct wm8350 *wm8350 = data->chip_data;
struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
int i;

for (i = 0; i < ARRAY_SIZE(wm8350->irq_masks); i++) {
Expand All @@ -444,7 +444,7 @@ static void wm8350_irq_sync_unlock(struct irq_data *data)

static void wm8350_irq_enable(struct irq_data *data)
{
struct wm8350 *wm8350 = data->chip_data;
struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350,
data->irq);

Expand All @@ -453,7 +453,7 @@ static void wm8350_irq_enable(struct irq_data *data)

static void wm8350_irq_disable(struct irq_data *data)
{
struct wm8350 *wm8350 = data->chip_data;
struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350,
data->irq);

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/mfd/wm8994-irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,14 @@ static inline struct wm8994_irq_data *irq_to_wm8994_irq(struct wm8994 *wm8994,

static void wm8994_irq_lock(struct irq_data *data)
{
struct wm8994 *wm8994 = data->chip_data;
struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);

mutex_lock(&wm8994->irq_lock);
}

static void wm8994_irq_sync_unlock(struct irq_data *data)
{
struct wm8994 *wm8994 = data->chip_data;
struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
int i;

for (i = 0; i < ARRAY_SIZE(wm8994->irq_masks_cur); i++) {
Expand All @@ -184,7 +184,7 @@ static void wm8994_irq_sync_unlock(struct irq_data *data)

static void wm8994_irq_unmask(struct irq_data *data)
{
struct wm8994 *wm8994 = data->chip_data;
struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,
data->irq);

Expand All @@ -193,7 +193,7 @@ static void wm8994_irq_unmask(struct irq_data *data)

static void wm8994_irq_mask(struct irq_data *data)
{
struct wm8994 *wm8994 = data->chip_data;
struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,
data->irq);

Expand Down

0 comments on commit 14071bf

Please sign in to comment.