From: Michael Hunold <hunold@linuxtv.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>
Subject: Re: [PATCH][2.6][14/14] follow saa7146 changes in other drivers
Date: Fri, 17 Sep 2004 16:42:19 +0200 [thread overview]
Message-ID: <414AF7CB.5010100@linuxtv.org> (raw)
In-Reply-To: <414AF779.6040409@linuxtv.org>
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 14-V4L-follow-changes-in-saa7146.diff --]
[-- Type: text/plain, Size: 4167 bytes --]
- [V4L] mxb, dpc7146, hexium_orion, hexium_gemini: follow latest changes in saa7146 driver
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
diff -ura a/drivers/media/video/dpc7146.c linux-2.6.8.1-dvb2/drivers/media/video/dpc7146.c
--- a/drivers/media/video/dpc7146.c 2004-09-17 14:35:42.000000000 +0200
+++ linux-2.6.8.1-dvb2/drivers/media/video/dpc7146.c 2004-09-17 14:40:49.000000000 +0200
@@ -79,8 +79,8 @@
struct dpc
{
- struct video_device video_dev;
- struct video_device vbi_dev;
+ struct video_device *video_dev;
+ struct video_device *vbi_dev;
struct i2c_adapter i2c_adapter;
struct i2c_client *saa7111a;
@@ -106,7 +106,11 @@
video port pins should be enabled here ?! */
saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
- saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, I2C_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
+ dpc->i2c_adapter = (struct i2c_adapter) {
+ .class = I2C_CLASS_TV_ANALOG,
+ .name = "dpc7146",
+ };
+ saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
if(i2c_add_adapter(&dpc->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(dpc);
diff -ura a/drivers/media/video/hexium_gemini.c linux-2.6.8.1-dvb2/drivers/media/video/hexium_gemini.c
--- a/drivers/media/video/hexium_gemini.c 2004-09-17 14:35:36.000000000 +0200
+++ linux-2.6.8.1-dvb2/drivers/media/video/hexium_gemini.c 2004-09-17 14:43:36.000000000 +0200
@@ -78,7 +78,8 @@
struct hexium
{
int type;
- struct video_device video_dev;
+
+ struct video_device *video_dev;
struct i2c_adapter i2c_adapter;
int cur_input; /* current input */
@@ -250,7 +251,11 @@
/* enable i2c-port pins */
saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
- saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, I2C_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
+ hexium->i2c_adapter = (struct i2c_adapter) {
+ .class = I2C_CLASS_TV_ANALOG,
+ .name = "hexium gemini",
+ };
+ saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(hexium);
diff -ura a/drivers/media/video/hexium_orion.c linux-2.6.8.1-dvb2/drivers/media/video/hexium_orion.c
--- a/drivers/media/video/hexium_orion.c 2004-09-17 14:35:36.000000000 +0200
+++ linux-2.6.8.1-dvb2/drivers/media/video/hexium_orion.c 2004-09-17 14:43:54.000000000 +0200
@@ -68,8 +68,9 @@
struct hexium
{
int type;
- struct video_device video_dev;
+ struct video_device *video_dev;
struct i2c_adapter i2c_adapter;
+
int cur_input; /* current input */
};
@@ -237,7 +238,11 @@
saa7146_write(dev, DD1_STREAM_B, 0x00000000);
saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
- saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, I2C_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
+ hexium->i2c_adapter = (struct i2c_adapter) {
+ .class = I2C_CLASS_TV_ANALOG,
+ .name = "hexium orion",
+ };
+ saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(hexium);
diff -ura a/drivers/media/video/mxb.c linux-2.6.8.1-dvb2/drivers/media/video/mxb.c
--- a/drivers/media/video/mxb.c 2004-09-17 14:35:32.000000000 +0200
+++ linux-2.6.8.1-dvb2/drivers/media/video/mxb.c 2004-09-17 14:44:17.000000000 +0200
@@ -128,8 +128,8 @@
struct mxb
{
- struct video_device video_dev;
- struct video_device vbi_dev;
+ struct video_device *video_dev;
+ struct video_device *vbi_dev;
struct i2c_adapter i2c_adapter;
@@ -183,7 +183,12 @@
}
memset(mxb, 0x0, sizeof(struct mxb));
- saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, I2C_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
+ mxb->i2c_adapter = (struct i2c_adapter) {
+ .class = I2C_CLASS_TV_ANALOG,
+ .name = "mxb",
+ };
+
+ saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
if(i2c_add_adapter(&mxb->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(mxb);
next prev parent reply other threads:[~2004-09-17 15:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-17 14:20 [PATCH][2.6][0/14] DVB subsystem update Michael Hunold
2004-09-17 14:22 ` [PATCH][2.6][1/14] update saa7146 driver Michael Hunold
2004-09-17 14:24 ` [PATCH][2.6][2/14] documentation update Michael Hunold
2004-09-17 14:26 ` [PATCH][2.6][3/14] dvb-bt8xx and skystar2 driver update Michael Hunold
2004-09-17 14:27 ` [PATCH][2.6][4/14] dvb core update Michael Hunold
2004-09-17 14:29 ` [PATCH][2.6][5/14] convert frontend drivers to kernel i2c 1/3 Michael Hunold
2004-09-17 14:30 ` [PATCH][2.6][6/14] convert frontend drivers to kernel i2c 2/3 Michael Hunold
2004-09-17 14:32 ` [PATCH][2.6][7/14] convert frontend drivers to kernel i2c 3/3 Michael Hunold
2004-09-17 14:33 ` [PATCH][2.6][8/14] some more frontend drivers to converted to kernel i2c Michael Hunold
2004-09-17 14:34 ` [PATCH][2.6][9/14] add new frontend drivers 1/2 Michael Hunold
2004-09-17 14:36 ` [PATCH][2.6][10/14] add new frontend drivers 2/2 Michael Hunold
2004-09-17 14:37 ` [PATCH][2.6][11/14] new DVB driver Michael Hunold
2004-09-17 14:39 ` [PATCH][2.6][12/14] misc. driver updates Michael Hunold
2004-09-17 14:40 ` [PATCH][2.6][13/14] dvb frontend updates Michael Hunold
2004-09-17 14:42 ` Michael Hunold [this message]
2004-09-20 11:11 ` [PATCH][2.6][12.1/14] DVB: add kernel message classifiers Philipp Matthias Hahn
2004-09-20 16:46 ` Michael Hunold
2004-09-17 14:58 ` [PATCH][2.6][4/14] dvb core update Jesper Juhl
2004-09-17 15:35 ` Linus Torvalds
2004-09-17 15:58 ` Alan Cox
2004-09-17 15:28 ` Richard B. Johnson
2004-09-17 23:41 ` [PATCH][2.6][0/14] DVB subsystem update Andrew Morton
2004-09-20 11:42 ` Michael Hunold
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=414AF7CB.5010100@linuxtv.org \
--to=hunold@linuxtv.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.