|
From: <sle...@us...> - 2007-06-22 01:43:24
|
Revision: 1043
http://svn.sourceforge.net/hackndev/?rev=1043&view=rev
Author: sleep_walker
Date: 2007-06-21 18:43:20 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
l4p: tsc2101 cleaning
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/mfd/tsc2101.c
Modified: linux4palm/linux/trunk/drivers/mfd/tsc2101.c
===================================================================
--- linux4palm/linux/trunk/drivers/mfd/tsc2101.c 2007-06-22 01:34:51 UTC (rev 1042)
+++ linux4palm/linux/trunk/drivers/mfd/tsc2101.c 2007-06-22 01:43:20 UTC (rev 1043)
@@ -142,7 +142,7 @@
tsc2101_regwrite(devdata, TSC2101_REG_ADC, 0x4000);
}
-static void ts_interrupt_main(struct tsc2101_data *devdata, int isTimer, struct pt_regs *regs)
+static void ts_interrupt_main(struct tsc2101_data *devdata, int isTimer)
{
unsigned long flags;
struct tsc2101_ts_event ts_data;
@@ -181,15 +181,15 @@
{
struct tsc2101_data *devdata = (struct tsc2101_data *) data;
- ts_interrupt_main(devdata, 1, NULL);
+ ts_interrupt_main(devdata, 1);
}
-static irqreturn_t tsc2101_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t tsc2101_handler(int irq, void *dev_id)
{
struct tsc2101_data *devdata = dev_id;
set_irq_type(devdata->platform->irq,IRQT_NOEDGE);
- ts_interrupt_main(devdata, 0, regs);
+ ts_interrupt_main(devdata, 0);
return IRQ_HANDLED;
}
@@ -238,9 +238,10 @@
printk(KERN_ERR "TSC2101 Temp2: %04x\n",devdata->miscdata.temp2);
}
-static int tsc2101_suspend(struct device *dev, u32 state, u32 level)
+static int tsc2101_suspend(struct device *dev, pm_message_t state)
{
struct tsc2101_data *devdata = dev_get_drvdata(dev);
+
/* comment this out like in old driver, it's sick though */
/* if (level == SUSPEND_POWER_DOWN) { */
tsc2101_ts_disable(devdata);
@@ -250,7 +251,7 @@
return 0;
}
-static int tsc2101_resume(struct device *dev, u32 level)
+static int tsc2101_resume(struct device *dev)
{
struct tsc2101_data *devdata = dev_get_drvdata(dev);
@@ -311,7 +312,7 @@
free_irq(devdata->platform->irq, devdata);
del_timer_sync(&devdata->ts_timer);
del_timer_sync(&devdata->misc_timer);
- input_unregister_device(&devdata->inputdevice);
+ input_unregister_device(devdata->inputdevice);
tsc2101_ts_disable(devdata);
kfree(devdata);
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|