From: Sakari Ailus <sakari.ailus@nokia.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH] ARM: OMAP2: Camera: Adapt to 2.6.20.
Date: Wed, 28 Feb 2007 17:59:16 +0200 [thread overview]
Message-ID: <1172678356543-git-send-email-sakari.ailus@nokia.com> (raw)
In-Reply-To: <11726783561918-git-send-email-sakari.ailus@nokia.com>
Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
---
drivers/media/video/omap/omap24xxcam-sensor.c | 6 ++++--
drivers/media/video/omap/omap24xxcam.c | 12 +++++++-----
drivers/media/video/omap/omap24xxcam.h | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/media/video/omap/omap24xxcam-sensor.c b/drivers/media/video/omap/omap24xxcam-sensor.c
index bde7429..3f1ab05 100644
--- a/drivers/media/video/omap/omap24xxcam-sensor.c
+++ b/drivers/media/video/omap/omap24xxcam-sensor.c
@@ -132,9 +132,11 @@ void omap24xxcam_sensor_disable(struct omap24xxcam_device *cam)
cam->sensor->power_off(cam->sensor);
}
-void omap24xxcam_sensor_reset_work(void * data)
+void omap24xxcam_sensor_reset_work(struct work_struct *work)
{
- struct omap24xxcam_device *cam = (struct omap24xxcam_device *)data;
+ struct omap24xxcam_device *cam =
+ container_of(work, struct omap24xxcam_device,
+ sensor_reset_work);
omap24xxcam_sensor_disable(cam);
diff --git a/drivers/media/video/omap/omap24xxcam.c b/drivers/media/video/omap/omap24xxcam.c
index 4f954ed..c8f1b74 100644
--- a/drivers/media/video/omap/omap24xxcam.c
+++ b/drivers/media/video/omap/omap24xxcam.c
@@ -148,9 +148,11 @@ static void omap24xxcam_reset_timer(unsigned long data)
omap24xxcam_camera_reset_schedule(cam);
}
-void omap24xxcam_camera_reset_work(void * data)
+void omap24xxcam_camera_reset_work(struct work_struct *work)
{
- struct omap24xxcam_device *cam = (struct omap24xxcam_device *)data;
+ struct omap24xxcam_device *cam =
+ container_of(work, struct omap24xxcam_device,
+ sensor_reset_work);
/* Disable and reset the camera interface. */
omap24xxcam_core_disable(&cam->core);
@@ -190,7 +192,7 @@ void omap24xxcam_camera_reset_schedule(struct omap24xxcam_device *cam)
schedule_work(&cam->camera_reset_work);
}
-static irqreturn_t omap24xxcam_isr(int irq, void *arg, struct pt_regs *regs)
+static irqreturn_t omap24xxcam_isr(int irq, void *arg)
{
struct omap24xxcam_device *cam = (struct omap24xxcam_device *)arg;
unsigned long irqstatus;
@@ -1061,9 +1063,9 @@ static int omap24xxcam_probe(struct platform_device *pdev)
cam->sgdma.reset_timer.function = omap24xxcam_reset_timer;
cam->sgdma.reset_timer.data = (unsigned long)cam;
INIT_WORK(&cam->camera_reset_work,
- omap24xxcam_camera_reset_work, cam);
+ omap24xxcam_camera_reset_work);
INIT_WORK(&cam->sensor_reset_work,
- omap24xxcam_sensor_reset_work, cam);
+ omap24xxcam_sensor_reset_work);
/* initialize the spinlock used to serialize access to the image
* parameters
diff --git a/drivers/media/video/omap/omap24xxcam.h b/drivers/media/video/omap/omap24xxcam.h
index eba5ea6..9defee3 100644
--- a/drivers/media/video/omap/omap24xxcam.h
+++ b/drivers/media/video/omap/omap24xxcam.h
@@ -615,7 +615,7 @@ int omap24xxcam_sensor_init(struct omap24xxcam_device *cam);
void omap24xxcam_sensor_exit(struct omap24xxcam_device *cam);
int omap24xxcam_sensor_enable(struct omap24xxcam_device *cam);
void omap24xxcam_sensor_disable(struct omap24xxcam_device *cam);
-void omap24xxcam_sensor_reset_work(void * data);
+void omap24xxcam_sensor_reset_work(struct work_struct *work);
void omap24xxcam_sensor_reset_schedule(struct omap_camera *oc,
struct omap_camera_sensor *os);
unsigned long omap24xxcam_sensor_calc_xclk(struct omap24xxcam_device *cam,
--
1.5.0.1
next prev parent reply other threads:[~2007-02-28 15:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-28 15:49 [PATCH] OMAP2 camera and TCM825x sensor drivers Sakari Ailus
2007-02-28 15:59 ` [PATCH] ARM: OMAP2: Camera: Add OMAP2 24xx camera driver Sakari Ailus
2007-02-28 15:59 ` [PATCH] ARM: OMAP2: Camera: Add a driver for TCM825x sensor Sakari Ailus
2007-02-28 15:59 ` [PATCH] ARM: OMAP2: Camera: Modify sensor interface Sakari Ailus
2007-02-28 15:59 ` Sakari Ailus [this message]
2007-03-01 5:28 ` [PATCH] ARM: OMAP2: Camera: Adapt to 2.6.20 Trilok Soni
2007-03-02 11:49 ` Sakari Ailus
2007-03-01 7:26 ` [PATCH] ARM: OMAP2: Camera: Add OMAP2 24xx camera driver Trilok Soni
2007-03-02 17:50 ` Sakari Ailus
2007-03-02 15:18 ` Syed Mohammed, Khasim
2007-03-05 9:25 ` Sakari Ailus
2007-03-05 10:26 ` Trilok Soni
2007-03-02 19:12 ` Syed Mohammed, Khasim
[not found] ` <b8bf37780702280821wb17104chf75b973b420895ef@mail.gmail.com>
[not found] ` <200703010848.32757.andre.rosa@indt.org.br>
2007-03-14 9:29 ` Fwd: " Sakari Ailus
2007-02-28 16:39 ` [PATCH] OMAP2 camera and TCM825x sensor drivers Syed Mohammed, Khasim
2007-03-01 5:48 ` Trilok Soni
2007-03-01 8:06 ` tony
2007-03-01 23:03 ` Syed Mohammed, Khasim
2007-03-02 4:39 ` sahlot arvind
2007-03-02 11:15 ` André Goddard Rosa
2007-03-07 12:08 ` Sakari Ailus
2007-03-02 9:42 ` Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1172678356543-git-send-email-sakari.ailus@nokia.com \
--to=sakari.ailus@nokia.com \
--cc=linux-omap-open-source@linux.omap.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox