diff for duplicates of <4228E74F.9070706@pacbell.net> diff --git a/a/1.txt b/N1/1.txt index db6aa26..78c951a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -388,279 +388,3 @@ diff -Nru a/include/media/saa7146.h b/include/media/saa7146.h PS: I'm headed out of town for a week, and the above is only a cut&paste, so the correct patch is attached here once more. - - --------------- next part -------------- ---- ./include/linux/i2c.h.sav 2005-02-23 10:35:36.000000000 -0800 -+++ ./include/linux/i2c.h 2005-02-23 10:46:23.000000000 -0800 -@@ -55,7 +55,7 @@ - - /* Transfer num messages. - */ --extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num); -+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num); - - /* - * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. -@@ -194,7 +194,7 @@ - to NULL. If an adapter algorithm can do SMBus access, set - smbus_xfer. If set to NULL, the SMBus protocol is simulated - using common I2C messages */ -- int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], -+ int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, - int num); - int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, - unsigned short flags, char read_write, ---- ./drivers/i2c/busses/i2c-iop3xx.c.sav 2005-02-23 10:36:21.000000000 -0800 -+++ ./drivers/i2c/busses/i2c-iop3xx.c 2005-02-23 10:47:36.000000000 -0800 -@@ -361,7 +361,7 @@ - * master_xfer() - main read/write entry - */ - static int --iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], -+iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, - int num) - { - struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; ---- ./drivers/i2c/i2c-core.c.sav 2005-02-23 10:34:59.000000000 -0800 -+++ ./drivers/i2c/i2c-core.c 2005-02-23 10:49:18.000000000 -0800 -@@ -583,7 +583,7 @@ - * ---------------------------------------------------- - */ - --int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num) -+int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num) - { - int ret; - ---- ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.sav 2005-02-23 10:39:53.000000000 -0800 -+++ ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c 2005-02-23 10:50:07.000000000 -0800 -@@ -252,7 +252,7 @@ - return rcv_len; - } - --static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num) -+static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) - { - struct ttusb *ttusb = i2c_get_adapdata(adapter); - int i = 0; ---- ./drivers/media/dvb/b2c2/skystar2.c.sav 2005-02-23 10:40:33.000000000 -0800 -+++ ./drivers/media/dvb/b2c2/skystar2.c 2005-02-23 10:50:42.000000000 -0800 -@@ -293,7 +293,7 @@ - return buf - start; - } - --static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msgs[], int num) -+static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msgs, int num) - { - struct adapter *tmp = i2c_get_adapdata(adapter); - int i, ret = 0; ---- ./Documentation/i2c/writing-clients.sav 2005-02-23 10:42:00.000000000 -0800 -+++ ./Documentation/i2c/writing-clients 2005-02-23 10:42:30.000000000 -0800 -@@ -642,7 +642,7 @@ - parameter contains the bytes the read/write, the third the length of the - buffer. Returned is the actual number of bytes read/written. - -- extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], -+ extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, - int num); - - This sends a series of messages. Each message can be a read or write, ---- ./include/media/saa7146.h.sav 2005-02-23 12:01:51.000000000 -0800 -+++ ./include/media/saa7146.h 2005-02-23 12:19:38.000000000 -0800 -@@ -157,7 +157,7 @@ - - /* from saa7146_i2c.c */ - int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate); --int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num, int retries); -+int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, int num, int retries); - - /* from saa7146_core.c */ - extern struct list_head saa7146_devices; ---- ./drivers/i2c/busses/i2c-s3c2410.c.sav 2005-02-23 12:03:29.000000000 -0800 -+++ ./drivers/i2c/busses/i2c-s3c2410.c 2005-02-23 12:20:31.000000000 -0800 -@@ -483,7 +483,7 @@ - * this starts an i2c transfer - */ - --static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg msgs[], int num) -+static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num) - { - unsigned long timeout; - int ret; -@@ -534,7 +534,7 @@ - */ - - static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, -- struct i2c_msg msgs[], int num) -+ struct i2c_msg *msgs, int num) - { - struct s3c24xx_i2c *i2c = (struct s3c24xx_i2c *)adap->algo_data; - int retry; ---- ./drivers/i2c/busses/i2c-mpc.c.sav 2005-02-23 12:04:11.000000000 -0800 -+++ ./drivers/i2c/busses/i2c-mpc.c 2005-02-23 12:17:28.000000000 -0800 -@@ -233,7 +233,7 @@ - return length; - } - --static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) -+static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) - { - struct i2c_msg *pmsg; - int i; ---- ./drivers/i2c/busses/i2c-ibm_iic.c.sav 2005-02-23 12:04:42.000000000 -0800 -+++ ./drivers/i2c/busses/i2c-ibm_iic.c 2005-02-23 12:21:08.000000000 -0800 -@@ -549,7 +549,7 @@ - * Generic master transfer entrypoint. - * Returns the number of processed messages or error (<0) - */ --static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) -+static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) - { - struct ibm_iic_private* dev = (struct ibm_iic_private*)(i2c_get_adapdata(adap)); - volatile struct iic_regs __iomem *iic = dev->vaddr; ---- ./drivers/i2c/busses/i2c-keywest.c.sav 2005-02-23 12:05:10.000000000 -0800 -+++ ./drivers/i2c/busses/i2c-keywest.c 2005-02-23 12:26:47.000000000 -0800 -@@ -399,7 +399,7 @@ - */ - static int - keywest_xfer( struct i2c_adapter *adap, -- struct i2c_msg msgs[], -+ struct i2c_msg *msgs, - int num) - { - struct keywest_chan* chan = i2c_get_adapdata(adap); ---- ./drivers/i2c/busses/i2c-au1550.c.sav 2005-02-23 12:06:00.000000000 -0800 -+++ ./drivers/i2c/busses/i2c-au1550.c 2005-02-23 12:27:39.000000000 -0800 -@@ -253,7 +253,7 @@ - } - - static int --au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) -+au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) - { - struct i2c_au1550_data *adap = i2c_adap->algo_data; - struct i2c_msg *p; ---- ./drivers/i2c/algos/i2c-algo-pca.c.sav 2005-02-23 12:06:21.000000000 -0800 -+++ ./drivers/i2c/algos/i2c-algo-pca.c 2005-02-23 12:28:09.000000000 -0800 -@@ -178,7 +178,7 @@ - } - - static int pca_xfer(struct i2c_adapter *i2c_adap, -- struct i2c_msg msgs[], -+ struct i2c_msg *msgs, - int num) - { - struct i2c_algo_pca_data *adap = i2c_adap->algo_data; ---- ./drivers/i2c/algos/i2c-algo-pcf.c.sav 2005-02-23 12:07:04.000000000 -0800 -+++ ./drivers/i2c/algos/i2c-algo-pcf.c 2005-02-23 12:28:49.000000000 -0800 -@@ -332,7 +332,7 @@ - } - - static int pcf_xfer(struct i2c_adapter *i2c_adap, -- struct i2c_msg msgs[], -+ struct i2c_msg *msgs, - int num) - { - struct i2c_algo_pcf_data *adap = i2c_adap->algo_data; ---- ./drivers/i2c/algos/i2c-algo-ite.c.sav 2005-02-23 12:07:17.000000000 -0800 -+++ ./drivers/i2c/algos/i2c-algo-ite.c 2005-02-23 12:29:31.000000000 -0800 -@@ -490,7 +490,7 @@ - * condition. - */ - #if 0 --static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) -+static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) - { - int i; - struct i2c_msg *pmsg; -@@ -600,7 +600,7 @@ - * verify that the bus is not busy or in some unknown state. - */ - static int iic_xfer(struct i2c_adapter *i2c_adap, -- struct i2c_msg msgs[], -+ struct i2c_msg *msgs, - int num) - { - struct i2c_algo_iic_data *adap = i2c_adap->algo_data; ---- ./drivers/i2c/algos/i2c-algo-sgi.c.sav 2005-02-23 12:07:40.000000000 -0800 -+++ ./drivers/i2c/algos/i2c-algo-sgi.c 2005-02-23 12:29:58.000000000 -0800 -@@ -131,7 +131,7 @@ - return 0; - } - --static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], -+static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, - int num) - { - struct i2c_algo_sgi_data *adap = i2c_adap->algo_data; ---- ./drivers/media/video/saa7134/saa7134-i2c.c.sav 2005-02-23 12:08:12.000000000 -0800 -+++ ./drivers/media/video/saa7134/saa7134-i2c.c 2005-02-23 12:30:20.000000000 -0800 -@@ -236,7 +236,7 @@ - } - - static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, -- struct i2c_msg msgs[], int num) -+ struct i2c_msg *msgs, int num) - { - struct saa7134_dev *dev = i2c_adap->algo_data; - enum i2c_status status; ---- ./drivers/media/video/bttv-i2c.c.sav 2005-02-23 12:08:29.000000000 -0800 -+++ ./drivers/media/video/bttv-i2c.c 2005-02-23 12:30:56.000000000 -0800 -@@ -245,7 +245,7 @@ - return retval; - } - --static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) -+static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) - { - struct bttv *btv = i2c_get_adapdata(i2c_adap); - int retval = 0; ---- ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c.sav 2005-02-23 12:09:43.000000000 -0800 -+++ ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c 2005-02-23 12:31:38.000000000 -0800 -@@ -38,7 +38,7 @@ - /* - * I2C master xfer function - */ --static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num) -+static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num) - { - struct usb_dibusb *dib = i2c_get_adapdata(adap); - int i; ---- ./drivers/media/common/saa7146_i2c.c.sav 2005-02-23 12:10:06.000000000 -0800 -+++ ./drivers/media/common/saa7146_i2c.c 2005-02-23 12:32:45.000000000 -0800 -@@ -25,7 +25,7 @@ - sent through the saa7146. have a look at the specifications p. 122 ff - to understand this. it returns the number of u32s to send, or -1 - in case of an error. */ --static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op) -+static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, u32 *op) - { - int h1, h2; - int i, j, addr; -@@ -89,7 +89,7 @@ - which bytes were read through the adapter and write them back to the corresponding - i2c-message. but instead, we simply write back all bytes. - fixme: this could be improved. */ --static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op) -+static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, u32 *op) - { - int i, j; - int op_count = 0; -@@ -272,7 +272,7 @@ - return 0; - } - --int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], int num, int retries) -+int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries) - { - int i = 0, count = 0; - u32* buffer = dev->d_i2c.cpu_addr; -@@ -372,7 +372,7 @@ - } - - /* utility functions */ --static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num) -+static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) - { - struct saa7146_dev* dev = i2c_get_adapdata(adapter); diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..f4f8cf2 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/plain; + name="i2c_xfer.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename="i2c_xfer.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..5cda398 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,273 @@ +--- ./include/linux/i2c.h.sav 2005-02-23 10:35:36.000000000 -0800 ++++ ./include/linux/i2c.h 2005-02-23 10:46:23.000000000 -0800 +@@ -55,7 +55,7 @@ + + /* Transfer num messages. + */ +-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num); ++extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num); + + /* + * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. +@@ -194,7 +194,7 @@ + to NULL. If an adapter algorithm can do SMBus access, set + smbus_xfer. If set to NULL, the SMBus protocol is simulated + using common I2C messages */ +- int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], ++ int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, + int num); + int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, + unsigned short flags, char read_write, +--- ./drivers/i2c/busses/i2c-iop3xx.c.sav 2005-02-23 10:36:21.000000000 -0800 ++++ ./drivers/i2c/busses/i2c-iop3xx.c 2005-02-23 10:47:36.000000000 -0800 +@@ -361,7 +361,7 @@ + * master_xfer() - main read/write entry + */ + static int +-iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], ++iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, + int num) + { + struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; +--- ./drivers/i2c/i2c-core.c.sav 2005-02-23 10:34:59.000000000 -0800 ++++ ./drivers/i2c/i2c-core.c 2005-02-23 10:49:18.000000000 -0800 +@@ -583,7 +583,7 @@ + * ---------------------------------------------------- + */ + +-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num) ++int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num) + { + int ret; + +--- ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.sav 2005-02-23 10:39:53.000000000 -0800 ++++ ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c 2005-02-23 10:50:07.000000000 -0800 +@@ -252,7 +252,7 @@ + return rcv_len; + } + +-static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num) ++static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) + { + struct ttusb *ttusb = i2c_get_adapdata(adapter); + int i = 0; +--- ./drivers/media/dvb/b2c2/skystar2.c.sav 2005-02-23 10:40:33.000000000 -0800 ++++ ./drivers/media/dvb/b2c2/skystar2.c 2005-02-23 10:50:42.000000000 -0800 +@@ -293,7 +293,7 @@ + return buf - start; + } + +-static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msgs[], int num) ++static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msgs, int num) + { + struct adapter *tmp = i2c_get_adapdata(adapter); + int i, ret = 0; +--- ./Documentation/i2c/writing-clients.sav 2005-02-23 10:42:00.000000000 -0800 ++++ ./Documentation/i2c/writing-clients 2005-02-23 10:42:30.000000000 -0800 +@@ -642,7 +642,7 @@ + parameter contains the bytes the read/write, the third the length of the + buffer. Returned is the actual number of bytes read/written. + +- extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], ++ extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, + int num); + + This sends a series of messages. Each message can be a read or write, +--- ./include/media/saa7146.h.sav 2005-02-23 12:01:51.000000000 -0800 ++++ ./include/media/saa7146.h 2005-02-23 12:19:38.000000000 -0800 +@@ -157,7 +157,7 @@ + + /* from saa7146_i2c.c */ + int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate); +-int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num, int retries); ++int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, int num, int retries); + + /* from saa7146_core.c */ + extern struct list_head saa7146_devices; +--- ./drivers/i2c/busses/i2c-s3c2410.c.sav 2005-02-23 12:03:29.000000000 -0800 ++++ ./drivers/i2c/busses/i2c-s3c2410.c 2005-02-23 12:20:31.000000000 -0800 +@@ -483,7 +483,7 @@ + * this starts an i2c transfer + */ + +-static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg msgs[], int num) ++static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num) + { + unsigned long timeout; + int ret; +@@ -534,7 +534,7 @@ + */ + + static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, +- struct i2c_msg msgs[], int num) ++ struct i2c_msg *msgs, int num) + { + struct s3c24xx_i2c *i2c = (struct s3c24xx_i2c *)adap->algo_data; + int retry; +--- ./drivers/i2c/busses/i2c-mpc.c.sav 2005-02-23 12:04:11.000000000 -0800 ++++ ./drivers/i2c/busses/i2c-mpc.c 2005-02-23 12:17:28.000000000 -0800 +@@ -233,7 +233,7 @@ + return length; + } + +-static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) ++static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) + { + struct i2c_msg *pmsg; + int i; +--- ./drivers/i2c/busses/i2c-ibm_iic.c.sav 2005-02-23 12:04:42.000000000 -0800 ++++ ./drivers/i2c/busses/i2c-ibm_iic.c 2005-02-23 12:21:08.000000000 -0800 +@@ -549,7 +549,7 @@ + * Generic master transfer entrypoint. + * Returns the number of processed messages or error (<0) + */ +-static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) ++static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) + { + struct ibm_iic_private* dev = (struct ibm_iic_private*)(i2c_get_adapdata(adap)); + volatile struct iic_regs __iomem *iic = dev->vaddr; +--- ./drivers/i2c/busses/i2c-keywest.c.sav 2005-02-23 12:05:10.000000000 -0800 ++++ ./drivers/i2c/busses/i2c-keywest.c 2005-02-23 12:26:47.000000000 -0800 +@@ -399,7 +399,7 @@ + */ + static int + keywest_xfer( struct i2c_adapter *adap, +- struct i2c_msg msgs[], ++ struct i2c_msg *msgs, + int num) + { + struct keywest_chan* chan = i2c_get_adapdata(adap); +--- ./drivers/i2c/busses/i2c-au1550.c.sav 2005-02-23 12:06:00.000000000 -0800 ++++ ./drivers/i2c/busses/i2c-au1550.c 2005-02-23 12:27:39.000000000 -0800 +@@ -253,7 +253,7 @@ + } + + static int +-au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) ++au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) + { + struct i2c_au1550_data *adap = i2c_adap->algo_data; + struct i2c_msg *p; +--- ./drivers/i2c/algos/i2c-algo-pca.c.sav 2005-02-23 12:06:21.000000000 -0800 ++++ ./drivers/i2c/algos/i2c-algo-pca.c 2005-02-23 12:28:09.000000000 -0800 +@@ -178,7 +178,7 @@ + } + + static int pca_xfer(struct i2c_adapter *i2c_adap, +- struct i2c_msg msgs[], ++ struct i2c_msg *msgs, + int num) + { + struct i2c_algo_pca_data *adap = i2c_adap->algo_data; +--- ./drivers/i2c/algos/i2c-algo-pcf.c.sav 2005-02-23 12:07:04.000000000 -0800 ++++ ./drivers/i2c/algos/i2c-algo-pcf.c 2005-02-23 12:28:49.000000000 -0800 +@@ -332,7 +332,7 @@ + } + + static int pcf_xfer(struct i2c_adapter *i2c_adap, +- struct i2c_msg msgs[], ++ struct i2c_msg *msgs, + int num) + { + struct i2c_algo_pcf_data *adap = i2c_adap->algo_data; +--- ./drivers/i2c/algos/i2c-algo-ite.c.sav 2005-02-23 12:07:17.000000000 -0800 ++++ ./drivers/i2c/algos/i2c-algo-ite.c 2005-02-23 12:29:31.000000000 -0800 +@@ -490,7 +490,7 @@ + * condition. + */ + #if 0 +-static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) ++static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) + { + int i; + struct i2c_msg *pmsg; +@@ -600,7 +600,7 @@ + * verify that the bus is not busy or in some unknown state. + */ + static int iic_xfer(struct i2c_adapter *i2c_adap, +- struct i2c_msg msgs[], ++ struct i2c_msg *msgs, + int num) + { + struct i2c_algo_iic_data *adap = i2c_adap->algo_data; +--- ./drivers/i2c/algos/i2c-algo-sgi.c.sav 2005-02-23 12:07:40.000000000 -0800 ++++ ./drivers/i2c/algos/i2c-algo-sgi.c 2005-02-23 12:29:58.000000000 -0800 +@@ -131,7 +131,7 @@ + return 0; + } + +-static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], ++static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, + int num) + { + struct i2c_algo_sgi_data *adap = i2c_adap->algo_data; +--- ./drivers/media/video/saa7134/saa7134-i2c.c.sav 2005-02-23 12:08:12.000000000 -0800 ++++ ./drivers/media/video/saa7134/saa7134-i2c.c 2005-02-23 12:30:20.000000000 -0800 +@@ -236,7 +236,7 @@ + } + + static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, +- struct i2c_msg msgs[], int num) ++ struct i2c_msg *msgs, int num) + { + struct saa7134_dev *dev = i2c_adap->algo_data; + enum i2c_status status; +--- ./drivers/media/video/bttv-i2c.c.sav 2005-02-23 12:08:29.000000000 -0800 ++++ ./drivers/media/video/bttv-i2c.c 2005-02-23 12:30:56.000000000 -0800 +@@ -245,7 +245,7 @@ + return retval; + } + +-static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) ++static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) + { + struct bttv *btv = i2c_get_adapdata(i2c_adap); + int retval = 0; +--- ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c.sav 2005-02-23 12:09:43.000000000 -0800 ++++ ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c 2005-02-23 12:31:38.000000000 -0800 +@@ -38,7 +38,7 @@ + /* + * I2C master xfer function + */ +-static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num) ++static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num) + { + struct usb_dibusb *dib = i2c_get_adapdata(adap); + int i; +--- ./drivers/media/common/saa7146_i2c.c.sav 2005-02-23 12:10:06.000000000 -0800 ++++ ./drivers/media/common/saa7146_i2c.c 2005-02-23 12:32:45.000000000 -0800 +@@ -25,7 +25,7 @@ + sent through the saa7146. have a look at the specifications p. 122 ff + to understand this. it returns the number of u32s to send, or -1 + in case of an error. */ +-static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op) ++static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, u32 *op) + { + int h1, h2; + int i, j, addr; +@@ -89,7 +89,7 @@ + which bytes were read through the adapter and write them back to the corresponding + i2c-message. but instead, we simply write back all bytes. + fixme: this could be improved. */ +-static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op) ++static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, u32 *op) + { + int i, j; + int op_count = 0; +@@ -272,7 +272,7 @@ + return 0; + } + +-int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], int num, int retries) ++int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries) + { + int i = 0, count = 0; + u32* buffer = dev->d_i2c.cpu_addr; +@@ -372,7 +372,7 @@ + } + + /* utility functions */ +-static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num) ++static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) + { + struct saa7146_dev* dev = i2c_get_adapdata(adapter); diff --git a/a/content_digest b/N1/content_digest index c16d1f5..ca1e811 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "ref\011099685961021@kroah.com\0" - "From\0yekkim@pacbell.net (Mickey Stein)\0" - "Subject\0[PATCH] I2C: Fix some gcc 4.0 compile failures and warnings\0" - "Date\0Thu, 19 May 2005 06:25:41 +0000\0" + "From\0Mickey Stein <yekkim@pacbell.net>\0" + "Subject\0Re: [PATCH] I2C: Fix some gcc 4.0 compile failures and warnings\0" + "Date\0Fri, 04 Mar 2005 14:55:11 -0800\0" "To\0Greg K-H <greg@kroah.com>\0" "Cc\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" - "\00:1\0" + "\01:1\0" "b\0" "Greg KH wrote:\n" "\n" @@ -396,10 +396,10 @@ "\n" "\n" "PS: I'm headed out of town for a week, and the above is only a \n" - "cut&paste, so the correct patch is attached here once more.\n" - "\n" - "\n" - "-------------- next part --------------\n" + cut&paste, so the correct patch is attached here once more. + "\01:2\0" + "fn\0i2c_xfer.patch\0" + "b\0" "--- ./include/linux/i2c.h.sav\t2005-02-23 10:35:36.000000000 -0800\n" "+++ ./include/linux/i2c.h\t2005-02-23 10:46:23.000000000 -0800\n" "@@ -55,7 +55,7 @@\n" @@ -674,4 +674,4 @@ " {\n" " \tstruct saa7146_dev* dev = i2c_get_adapdata(adapter);" -290f4ac4280550ddaf2c657cde3e15c60ce8c70e7707681ae675abcb7b628936 +3ad79a82e5a2c48b52b138bcbe9fa8af6b98da83c6e47af6731d63cde0997332
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.