From: mark@alpha.dyndns.org (Mark McClelland)
To: lm-sensors@vger.kernel.org
Subject: [lm-sensors] Re: [PATCH 2.6] i2c: Fix incorrect ID uses
Date: Mon, 24 Oct 2005 15:12:03 +0000 [thread overview]
Message-ID: <435CDD72.7020501@alpha.dyndns.org> (raw)
In-Reply-To: <20051022154830.0b7688ab.khali@linux-fr.org>
Jean Delvare wrote:
> Hi all,
>
> I am enqueuing the following patch. Driver authors are invited to Ack
> their respective parts, or voice in if anything doesn't look OK.
>
> Thanks.
>
> Fix several incorrect uses and redefinitions of i2c IDs.
> In particular:
> * i2c algorithm IDs are gone;
> * i2c IDs must not be defined outside of i2c-id.h.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
>
>
(...)
> --- linux-2.6.14-rc4.orig/include/media/ovcamchip.h 2004-12-24 22:35:40.000000000 +0100
> +++ linux-2.6.14-rc4/include/media/ovcamchip.h 2005-10-22 14:23:00.000000000 +0200
> @@ -17,20 +17,6 @@
> #include <linux/videodev.h>
> #include <linux/i2c.h>
>
> -/* Remove these once they are officially defined */
> -#ifndef I2C_DRIVERID_OVCAMCHIP
> - #define I2C_DRIVERID_OVCAMCHIP 0xf00f
> -#endif
> -#ifndef I2C_HW_SMBUS_OV511
> - #define I2C_HW_SMBUS_OV511 0xfe
> -#endif
> -#ifndef I2C_HW_SMBUS_OV518
> - #define I2C_HW_SMBUS_OV518 0xff
> -#endif
> -#ifndef I2C_HW_SMBUS_OVFX2
> - #define I2C_HW_SMBUS_OVFX2 0xfd
> -#endif
> -
> /* --------------------------------- */
> /* ENUMERATIONS */
> /* --------------------------------- */
>
>
Acked-by: Mark McClelland <mark@alpha.dyndns.org>
Thanks for cleaning this up!
BTW, someone might want to take a look at include/media/id.h. It could
stand to be cleaned up or deleted altogether:
===
/* FIXME: this temporarely, until these are included in linux/i2c-id.h */
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l5>
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l6>/*
drivers */
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l7>#ifndef
I2C_DRIVERID_TVMIXER
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l8>#
define I2C_DRIVERID_TVMIXER I2C_DRIVERID_EXP0
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l9>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l10>#ifndef
I2C_DRIVERID_TVAUDIO
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l11>#
define I2C_DRIVERID_TVAUDIO I2C_DRIVERID_EXP1
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l12>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l13>
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l14>/*
chips */
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l15>#ifndef
I2C_DRIVERID_DPL3518
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l16>#
define I2C_DRIVERID_DPL3518 I2C_DRIVERID_EXP2
#endif
#ifndef I2C_DRIVERID_TDA9873
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l19>#
define I2C_DRIVERID_TDA9873 I2C_DRIVERID_EXP3
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l20>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l21>#ifndef
I2C_DRIVERID_TDA9875
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l22>#
define I2C_DRIVERID_TDA9875 I2C_DRIVERID_EXP0+4
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l23>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l24>#ifndef
I2C_DRIVERID_PIC16C54_PV951
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l25>#
define I2C_DRIVERID_PIC16C54_PV951 I2C_DRIVERID_EXP0+5
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l26>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l27>#ifndef
I2C_DRIVERID_TDA7432
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l28>#
define I2C_DRIVERID_TDA7432 I2C_DRIVERID_EXP0+6
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l29>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l30>#ifndef
I2C_DRIVERID_TDA9874
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l31>#
define I2C_DRIVERID_TDA9874 I2C_DRIVERID_EXP0+7
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l32>#endif
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l33>#ifndef
I2C_DRIVERID_SAA6752HS
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l34>#
define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8
<http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hm02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae;hbº9e358fd04190a59e605c2963a15e014139a707;f=include/media/id.h#l35>#endif
===
--
Mark McClelland
mark@alpha.dyndns.org
mark@ovcam.org
next prev parent reply other threads:[~2005-10-24 15:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-22 15:48 [lm-sensors] [PATCH 2.6] i2c: Fix incorrect ID uses Jean Delvare
2005-10-22 16:16 ` [lm-sensors] " Antonino A. Daplas
2005-10-22 18:43 ` Jean Delvare
2005-10-24 10:48 ` henk
2005-10-24 15:12 ` Mark McClelland [this message]
2005-10-24 16:01 ` Ladislav Michl
2005-10-24 16:39 ` Jean Delvare
2005-10-24 19:40 ` Jean Delvare
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=435CDD72.7020501@alpha.dyndns.org \
--to=mark@alpha.dyndns.org \
--cc=lm-sensors@vger.kernel.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.