From bb8d67e52137f98afb98b9c02d045577d6422b8d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <greg@kroah.com>
Date: Wed, 23 Apr 2003 21:14:04 -0700
Subject: [PATCH] [PATCH] i2c: fix up the media drivers due to removing flags
 paramater of callback function

---
 drivers/media/video/msp3400.c    | 6 ++----
 drivers/media/video/saa5249.c    | 2 +-
 drivers/media/video/saa7111.c    | 2 +-
 drivers/media/video/tda7432.c    | 3 +--
 drivers/media/video/tda9840.c    | 2 +-
 drivers/media/video/tda9875.c    | 3 +--
 drivers/media/video/tda9887.c    | 3 +--
 drivers/media/video/tea6415c.c   | 2 +-
 drivers/media/video/tea6420.c    | 2 +-
 drivers/media/video/tuner-3036.c | 3 +--
 drivers/media/video/tuner.c      | 3 +--
 drivers/media/video/tvaudio.c    | 3 +--
 12 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 91e5f334982d4..d81070e1b156b 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1208,8 +1208,7 @@ done:
 
 /* ----------------------------------------------------------------------- */
 
-static int msp_attach(struct i2c_adapter *adap, int addr,
-		      unsigned short flags, int kind);
+static int msp_attach(struct i2c_adapter *adap, int addr, int kind);
 static int msp_detach(struct i2c_client *client);
 static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
@@ -1233,8 +1232,7 @@ static struct i2c_client client_template =
 	},
 };
 
-static int msp_attach(struct i2c_adapter *adap, int addr,
-		      unsigned short flags, int kind)
+static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	DECLARE_MUTEX_LOCKED(sem);
 	struct msp3400c *msp;
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 3168419985431..df511ae63a8c4 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -149,7 +149,7 @@ static struct i2c_client_address_data addr_data = {
 
 static struct i2c_client client_template;
 
-static int saa5249_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)		
+static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	int pgbuf;
 	int err;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 9427c6dfea626..d27b45cc06b58 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -66,7 +66,7 @@ static struct i2c_client client_template;
 
 /* ----------------------------------------------------------------------- */
 
-static int saa7111_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
+static int saa7111_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	int i;
 	struct saa7111 *decoder;
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 51658f317e066..eaf5f5c8eef20 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -312,8 +312,7 @@ static void do_tda7432_init(struct i2c_client *client)
  * i2c interface functions *
  * *********************** */
 
-static int tda7432_attach(struct i2c_adapter *adap, int addr,
-			  unsigned short flags, int kind)
+static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	struct tda7432 *t;
 	struct i2c_client *client;
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 39d88201ec18e..275fe5f1d849d 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -178,7 +178,7 @@ static int tda9840_command(struct i2c_client *client, unsigned int cmd, void* ar
 	return 0;
 }
 
-static int tda9840_detect(struct i2c_adapter *adapter, int address, unsigned short flags, int kind)
+static int tda9840_detect(struct i2c_adapter *adapter, int address, int kind)
 {
 	struct	i2c_client *client;
 	int result = 0;
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 70a25e8c14a6f..0e97185a9b685 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -240,8 +240,7 @@ static int tda9875_checkit(struct i2c_adapter *adap, int addr)
 	return(0);
 }
 
-static int tda9875_attach(struct i2c_adapter *adap, int addr,
-			  unsigned short flags, int kind)
+static int tda9875_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	struct tda9875 *t;
 	struct i2c_client *client;
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 6b49ee1f18863..a674ff9f15c5b 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -345,8 +345,7 @@ static int tda9887_configure(struct tda9887 *t)
 
 /* ---------------------------------------------------------------------- */
 
-static int tda9887_attach(struct i2c_adapter *adap, int addr,
-			  unsigned short flags, int kind)
+static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	struct tda9887 *t;
 
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 71ce11a07f973..9fa7c34b54b09 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -55,7 +55,7 @@ static struct i2c_driver driver;
 static int tea6415c_id = 0;
 
 /* this function is called by i2c_probe */
-static int tea6415c_detect(struct i2c_adapter *adapter, int address, unsigned short flags, int kind)
+static int tea6415c_detect(struct i2c_adapter *adapter, int address, int kind)
 {
 	struct	i2c_client *client = 0;
 	int err = 0;
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index b55e8b26c21d5..74ea97c1f2d90 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -95,7 +95,7 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 }
 
 /* this function is called by i2c_probe */
-static int tea6420_detect(struct i2c_adapter *adapter, int address, unsigned short flags, int kind)
+static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 {
 	struct	i2c_client *client;
 	int err = 0, i = 0;
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 5b683c4afe0b7..61513bb0fae9b 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -114,8 +114,7 @@ set_tv_freq(struct i2c_client *c, int freq)
 /* ---------------------------------------------------------------------- */
 
 static int 
-tuner_attach(struct i2c_adapter *adap, int addr,
-	     unsigned short flags, int kind)
+tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	static unsigned char buffer[] = { 0x29, 0x32, 0x2a, 0, 0x2b, 0 };
 
diff --git a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c
index 54f9cc826218c..93de9a356f219 100644
--- a/drivers/media/video/tuner.c
+++ b/drivers/media/video/tuner.c
@@ -776,8 +776,7 @@ static void set_radio_freq(struct i2c_client *c, int freq)
 
 /* ---------------------------------------------------------------------- */
 
-static int tuner_attach(struct i2c_adapter *adap, int addr,
-			unsigned short flags, int kind)
+static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	struct tuner *t;
 	struct i2c_client *client;
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 1cb729c6ea06c..d546d6d72a148 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1326,8 +1326,7 @@ static struct CHIPDESC chiplist[] = {
 /* ---------------------------------------------------------------------- */
 /* i2c registration                                                       */
 
-static int chip_attach(struct i2c_adapter *adap, int addr,
-		       unsigned short flags, int kind)
+static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	struct CHIPSTATE *chip;
 	struct CHIPDESC  *desc;
-- 
2.53.0