* [PATCH 2.4] Trivial changes to I2C stuff
@ 2003-11-22 15:15 Jean Delvare
2003-11-22 15:47 ` Willy Tarreau
2003-11-22 16:49 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Jean Delvare @ 2003-11-22 15:15 UTC (permalink / raw)
To: Marcelo Tosatti, LKML; +Cc: LM Sensors, Greg KH
Hi Marcelo, hi list,
Below is a simple patch that does some trivial changes to a few i2c
drivers in 2.4.23-rc3. The changes are only white space and comment
changes, and line reordering. There are also two simple changes to
i2c-id.h to keep it in line with the one in Linux 2.6.0-test9.
Nothing dangerous here, as you'll see (and nothing very important
either, I admit), but I plan to submit a patch that updates the whole
i2c subsystem for Linux 2.4.24, and would like these changes done before
so that the diffs look better. I already made the required changes to
our CVS repository to ensure that all changes made to the kernel tree
since the last sync (i2c 2.6.1 in Linux 2.4.13) had been correctly back
ported. (Actually, this is how I found the little differences that the
patch below fixes.)
Please apply,
thanks.
diff -ru linux-2.4.23-rc3/drivers/i2c/i2c-core.c linux-2.4.23-rc3-k1/drivers/i2c/i2c-core.c
--- linux-2.4.23-rc3/drivers/i2c/i2c-core.c Mon Aug 25 13:44:41 2003
+++ linux-2.4.23-rc3-k1/drivers/i2c/i2c-core.c Sat Nov 22 09:14:37 2003
@@ -1427,9 +1427,10 @@
#ifdef MODULE
MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C-Bus main module");
+MODULE_LICENSE("GPL");
+
MODULE_PARM(i2c_debug, "i");
MODULE_PARM_DESC(i2c_debug,"debug level");
-MODULE_LICENSE("GPL");
int init_module(void)
{
diff -ru linux-2.4.23-rc3/drivers/i2c/i2c-dev.c linux-2.4.23-rc3-k1/drivers/i2c/i2c-dev.c
--- linux-2.4.23-rc3/drivers/i2c/i2c-dev.c Mon Aug 25 13:44:41 2003
+++ linux-2.4.23-rc3-k1/drivers/i2c/i2c-dev.c Sat Nov 22 10:07:25 2003
@@ -159,9 +159,9 @@
struct i2c_client *client = (struct i2c_client *)file->private_data;
- if(count > 8192)
+ if (count > 8192)
count = 8192;
-
+
/* copy user space data to kernel space. */
tmp = kmalloc(count,GFP_KERNEL);
if (tmp==NULL)
@@ -190,9 +190,9 @@
struct inode *inode = file->f_dentry->d_inode;
#endif /* DEBUG */
- if(count > 8192)
+ if (count > 8192)
count = 8192;
-
+
/* copy user space data to kernel space. */
tmp = kmalloc(count,GFP_KERNEL);
if (tmp==NULL)
diff -ru linux-2.4.23-rc3/drivers/i2c/i2c-elv.c linux-2.4.23-rc3-k1/drivers/i2c/i2c-elv.c
--- linux-2.4.23-rc3/drivers/i2c/i2c-elv.c Thu Oct 11 17:05:47 2001
+++ linux-2.4.23-rc3-k1/drivers/i2c/i2c-elv.c Sat Nov 22 09:15:25 2003
@@ -202,7 +202,6 @@
MODULE_DESCRIPTION("I2C-Bus adapter routines for ELV parallel port adapter");
MODULE_LICENSE("GPL");
-
MODULE_PARM(base, "i");
int init_module(void)
diff -ru linux-2.4.23-rc3/drivers/media/video/saa7110.c linux-2.4.23-rc3-k1/drivers/media/video/saa7110.c
--- linux-2.4.23-rc3/drivers/media/video/saa7110.c Sat Nov 22 09:09:37 2003
+++ linux-2.4.23-rc3-k1/drivers/media/video/saa7110.c Sat Nov 22 09:20:40 2003
@@ -404,7 +404,7 @@
{
"saa7110", /* name */
- I2C_DRIVERID_VIDEODECODER, /* in i2c.h */
+ I2C_DRIVERID_VIDEODECODER, /* in i2c-old.h */
I2C_SAA7110, I2C_SAA7110+1, /* Addr range */
saa7110_attach,
diff -ru linux-2.4.23-rc3/include/linux/i2c-id.h linux-2.4.23-rc3-k1/include/linux/i2c-id.h
--- linux-2.4.23-rc3/include/linux/i2c-id.h Sat Nov 22 09:09:41 2003
+++ linux-2.4.23-rc3-k1/include/linux/i2c-id.h Sat Nov 22 15:23:13 2003
@@ -90,7 +90,7 @@
#define I2C_DRIVERID_DRP3510 43 /* ADR decoder (Astra Radio) */
#define I2C_DRIVERID_SP5055 44 /* Satellite tuner */
#define I2C_DRIVERID_STV0030 45 /* Multipurpose switch */
-#define I2C_DRIVERID_ADV717X 48 /* video encoder */
+#define I2C_DRIVERID_ADV7175 48 /* ADV 7175/7176 video encoder */
#define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */
#define I2C_DRIVERID_EXP1 0xF1
@@ -199,7 +199,7 @@
#define I2C_HW_SMBUS_AMD756 0x05
#define I2C_HW_SMBUS_SIS5595 0x06
#define I2C_HW_SMBUS_ALI1535 0x07
-#define I2C_HW_SMBUS_W9968CF 0x08
+#define I2C_HW_SMBUS_W9968CF 0x0d
/* --- ISA pseudo-adapter */
#define I2C_HW_ISA 0x00
--
Jean Delvare
http://www.ensicaen.ismra.fr/~delvare/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.4] Trivial changes to I2C stuff
2003-11-22 15:15 [PATCH 2.4] Trivial changes to I2C stuff Jean Delvare
@ 2003-11-22 15:47 ` Willy Tarreau
2003-11-22 17:29 ` Jean Delvare
2003-11-22 16:49 ` Greg KH
1 sibling, 1 reply; 6+ messages in thread
From: Willy Tarreau @ 2003-11-22 15:47 UTC (permalink / raw)
To: Jean Delvare; +Cc: Marcelo Tosatti, LKML, LM Sensors, Greg KH
Hi !
On Sat, Nov 22, 2003 at 04:15:10PM +0100, Jean Delvare wrote:
> The changes are only white space and comment changes, and line reordering.
<...>
> @@ -199,7 +199,7 @@
> #define I2C_HW_SMBUS_AMD756 0x05
> #define I2C_HW_SMBUS_SIS5595 0x06
> #define I2C_HW_SMBUS_ALI1535 0x07
> -#define I2C_HW_SMBUS_W9968CF 0x08
> +#define I2C_HW_SMBUS_W9968CF 0x0d
Is this one intentionnal or just a typo ?
Cheers,
Willy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.4] Trivial changes to I2C stuff
2003-11-22 15:15 [PATCH 2.4] Trivial changes to I2C stuff Jean Delvare
2003-11-22 15:47 ` Willy Tarreau
@ 2003-11-22 16:49 ` Greg KH
2003-11-22 17:36 ` Jean Delvare
1 sibling, 1 reply; 6+ messages in thread
From: Greg KH @ 2003-11-22 16:49 UTC (permalink / raw)
To: Jean Delvare; +Cc: Marcelo Tosatti, LKML, LM Sensors
On Sat, Nov 22, 2003 at 04:15:10PM +0100, Jean Delvare wrote:
> Hi Marcelo, hi list,
>
> Below is a simple patch that does some trivial changes to a few i2c
> drivers in 2.4.23-rc3. The changes are only white space and comment
> changes, and line reordering. There are also two simple changes to
> i2c-id.h to keep it in line with the one in Linux 2.6.0-test9.
Woah, -rc3 is _way_ too late for patches such as this. Please wait for
2.4.23 to come out first.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.4] Trivial changes to I2C stuff
2003-11-22 15:47 ` Willy Tarreau
@ 2003-11-22 17:29 ` Jean Delvare
0 siblings, 0 replies; 6+ messages in thread
From: Jean Delvare @ 2003-11-22 17:29 UTC (permalink / raw)
To: Willy Tarreau; +Cc: marcelo, linux-kernel, sensors, greg
> > @@ -199,7 +199,7 @@
> > #define I2C_HW_SMBUS_AMD756 0x05
> > #define I2C_HW_SMBUS_SIS5595 0x06
> > #define I2C_HW_SMBUS_ALI1535 0x07
> > -#define I2C_HW_SMBUS_W9968CF 0x08
> > +#define I2C_HW_SMBUS_W9968CF 0x0d
>
> Is this one intentionnal or just a typo ?
Intentional. 0x08 is I2C_HW_SMBUS_SIS630 in both i2c-CVS and Linux 2.6.0-test9, so I chose the next available ID, which happens to be 0x0d. Anyway, these IDs have no real use AFAIK, so there is nothing to be afraid of here.
--
Jean Delvare
http://www.ensicaen.ismra.fr/~delvare/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.4] Trivial changes to I2C stuff
2003-11-22 16:49 ` Greg KH
@ 2003-11-22 17:36 ` Jean Delvare
2003-11-22 18:08 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Jean Delvare @ 2003-11-22 17:36 UTC (permalink / raw)
To: Greg KH; +Cc: marcelo, linux-kernel, sensors
> Woah, -rc3 is _way_ too late for patches such as this.
"Patches like this"? A patch could hardly do less (real) things than
this one. What's the problem? I thought -rc were a perfect place for
these kind of cleanup changes.
--
Jean Delvare
http://www.ensicaen.ismra.fr/~delvare/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.4] Trivial changes to I2C stuff
2003-11-22 17:36 ` Jean Delvare
@ 2003-11-22 18:08 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2003-11-22 18:08 UTC (permalink / raw)
To: sensors; +Cc: marcelo, linux-kernel
On Sat, Nov 22, 2003 at 06:36:17PM +0100, Jean Delvare wrote:
> > Woah, -rc3 is _way_ too late for patches such as this.
>
> "Patches like this"? A patch could hardly do less (real) things than
> this one. What's the problem? I thought -rc were a perfect place for
> these kind of cleanup changes.
Only _critical_ fixes are allowed during the -rc cycle. These are stuff
like bugfixes, not whitespace cleanups.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-11-22 18:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-11-22 15:15 [PATCH 2.4] Trivial changes to I2C stuff Jean Delvare
2003-11-22 15:47 ` Willy Tarreau
2003-11-22 17:29 ` Jean Delvare
2003-11-22 16:49 ` Greg KH
2003-11-22 17:36 ` Jean Delvare
2003-11-22 18:08 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).