aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/pcf50633-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/pcf50633-core.c')
-rw-r--r--drivers/mfd/pcf50633-core.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 5a2b76a8205..891f7623377 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -367,8 +367,7 @@ static void pcf50633_irq_worker(struct work_struct *work)
put_device(pcf->dev);
- if (!machine_is_openmoko_gta03())
- enable_irq(pcf->irq);
+ enable_irq(pcf->irq);
return;
reschedule:
@@ -387,8 +386,7 @@ static irqreturn_t pcf50633_irq(int irq, void *data)
get_device(pcf->dev);
- if (!machine_is_openmoko_gta03())
- disable_irq(pcf->irq);
+ disable_irq(pcf->irq);
schedule_work(&pcf->irq_work);
@@ -486,10 +484,6 @@ static int pcf50633_probe(struct i2c_client *client,
u8 mbcs1;
int version;
int variant;
- int irqf = IRQF_TRIGGER_LOW;
-
- if (machine_is_openmoko_gta03())
- irqf = IRQF_TRIGGER_FALLING;
pdata = client->dev.platform_data;
@@ -563,7 +557,7 @@ static int pcf50633_probe(struct i2c_client *client,
if (client->irq) {
ret = request_irq(client->irq, pcf50633_irq,
- irqf, "pcf50633", pcf);
+ IRQF_TRIGGER_LOW, "pcf50633", pcf);
if (ret) {
dev_err(pcf->dev, "Failed to request IRQ %d\n", ret);