source: scripts/patches/linux-2.6.11-gcc4_fixes.patch @ 3f8be484

clfs-1.2clfs-2.1clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 3f8be484 was 7f65c0e, checked in by Jim Gifford <clfs@…>, 18 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move
  • Property mode set to 100644
File size: 10.7 KB
RevLine 
[617118d]1--- ./include/linux/i2c.h.sav   2005-02-23 10:35:36.000000000 -0800
2+++ ./include/linux/i2c.h       2005-02-23 10:46:23.000000000 -0800
3@@ -55,7 +55,7 @@
4 
5 /* Transfer num messages.
6  */
7-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num);
8+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num);
9 
10 /*
11  * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor.
12@@ -194,7 +194,7 @@
13           to NULL. If an adapter algorithm can do SMBus access, set
14           smbus_xfer. If set to NULL, the SMBus protocol is simulated
15           using common I2C messages */
16-       int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[],
17+       int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs,
18                           int num);
19        int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,
20                           unsigned short flags, char read_write,
21--- ./drivers/i2c/busses/i2c-iop3xx.c.sav       2005-02-23 10:36:21.000000000 -0800
22+++ ./drivers/i2c/busses/i2c-iop3xx.c   2005-02-23 10:47:36.000000000 -0800
23@@ -361,7 +361,7 @@
24  * master_xfer() - main read/write entry
25  */
26 static int
27-iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[],
28+iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
29                                int num)
30 {
31        struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
32--- ./drivers/i2c/i2c-core.c.sav        2005-02-23 10:34:59.000000000 -0800
33+++ ./drivers/i2c/i2c-core.c    2005-02-23 10:49:18.000000000 -0800
34@@ -583,7 +583,7 @@
35  * ----------------------------------------------------
36  */
37 
38-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num)
39+int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
40 {
41        int ret;
42 
43--- ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.sav     2005-02-23 10:39:53.000000000 -0800
44+++ ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c 2005-02-23 10:50:07.000000000 -0800
45@@ -252,7 +252,7 @@
46        return rcv_len;
47 }
48 
49-static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
50+static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num)
51 {
52        struct ttusb *ttusb = i2c_get_adapdata(adapter);
53        int i = 0;
54--- ./drivers/media/dvb/b2c2/skystar2.c.sav     2005-02-23 10:40:33.000000000 -0800
55+++ ./drivers/media/dvb/b2c2/skystar2.c 2005-02-23 10:50:42.000000000 -0800
56@@ -293,7 +293,7 @@
57        return buf - start;
58 }
59 
60-static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msgs[], int num)
61+static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msgs, int num)
62 {
63        struct adapter *tmp = i2c_get_adapdata(adapter);
64        int i, ret = 0;
65--- ./Documentation/i2c/writing-clients.sav     2005-02-23 10:42:00.000000000 -0800
66+++ ./Documentation/i2c/writing-clients 2005-02-23 10:42:30.000000000 -0800
67@@ -642,7 +642,7 @@
68 parameter contains the bytes the read/write, the third the length of the
69 buffer. Returned is the actual number of bytes read/written.
70   
71-  extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
72+  extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg,
73                           int num);
74 
75 This sends a series of messages. Each message can be a read or write,
76--- ./include/media/saa7146.h.sav       2005-02-23 12:01:51.000000000 -0800
77+++ ./include/media/saa7146.h   2005-02-23 12:19:38.000000000 -0800
78@@ -157,7 +157,7 @@
79 
80 /* from saa7146_i2c.c */
81 int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);
82-int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num,  int retries);
83+int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, int num,  int retries);
84 
85 /* from saa7146_core.c */
86 extern struct list_head saa7146_devices;
87--- ./drivers/i2c/busses/i2c-s3c2410.c.sav      2005-02-23 12:03:29.000000000 -0800
88+++ ./drivers/i2c/busses/i2c-s3c2410.c  2005-02-23 12:20:31.000000000 -0800
89@@ -483,7 +483,7 @@
90  * this starts an i2c transfer
91 */
92 
93-static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg msgs[], int num)
94+static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num)
95 {
96        unsigned long timeout;
97        int ret;
98@@ -534,7 +534,7 @@
99 */
100 
101 static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
102-                       struct i2c_msg msgs[], int num)
103+                       struct i2c_msg *msgs, int num)
104 {
105        struct s3c24xx_i2c *i2c = (struct s3c24xx_i2c *)adap->algo_data;
106        int retry;
107--- ./drivers/i2c/busses/i2c-mpc.c.sav  2005-02-23 12:04:11.000000000 -0800
108+++ ./drivers/i2c/busses/i2c-mpc.c      2005-02-23 12:17:28.000000000 -0800
109@@ -233,7 +233,7 @@
110        return length;
111 }
112 
113-static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
114+static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
115 {
116        struct i2c_msg *pmsg;
117        int i;
118--- ./drivers/i2c/busses/i2c-ibm_iic.c.sav      2005-02-23 12:04:42.000000000 -0800
119+++ ./drivers/i2c/busses/i2c-ibm_iic.c  2005-02-23 12:21:08.000000000 -0800
120@@ -549,7 +549,7 @@
121  * Generic master transfer entrypoint.
122  * Returns the number of processed messages or error (<0)
123  */
124-static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
125+static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
126 {
127        struct ibm_iic_private* dev = (struct ibm_iic_private*)(i2c_get_adapdata(adap));
128        volatile struct iic_regs __iomem *iic = dev->vaddr;
129--- ./drivers/i2c/busses/i2c-keywest.c.sav      2005-02-23 12:05:10.000000000 -0800
130+++ ./drivers/i2c/busses/i2c-keywest.c  2005-02-23 12:26:47.000000000 -0800
131@@ -399,7 +399,7 @@
132  */
133 static int
134 keywest_xfer(  struct i2c_adapter *adap,
135-               struct i2c_msg msgs[],
136+               struct i2c_msg *msgs,
137                int num)
138 {
139        struct keywest_chan* chan = i2c_get_adapdata(adap);
140--- ./drivers/i2c/busses/i2c-au1550.c.sav       2005-02-23 12:06:00.000000000 -0800
141+++ ./drivers/i2c/busses/i2c-au1550.c   2005-02-23 12:27:39.000000000 -0800
142@@ -253,7 +253,7 @@
143 }
144 
145 static int
146-au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
147+au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
148 {
149        struct i2c_au1550_data *adap = i2c_adap->algo_data;
150        struct i2c_msg *p;
151--- ./drivers/i2c/algos/i2c-algo-pca.c.sav      2005-02-23 12:06:21.000000000 -0800
152+++ ./drivers/i2c/algos/i2c-algo-pca.c  2005-02-23 12:28:09.000000000 -0800
153@@ -178,7 +178,7 @@
154 }
155 
156 static int pca_xfer(struct i2c_adapter *i2c_adap,
157-                    struct i2c_msg msgs[],
158+                    struct i2c_msg *msgs,
159                     int num)
160 {
161         struct i2c_algo_pca_data *adap = i2c_adap->algo_data;
162--- ./drivers/i2c/algos/i2c-algo-pcf.c.sav      2005-02-23 12:07:04.000000000 -0800
163+++ ./drivers/i2c/algos/i2c-algo-pcf.c  2005-02-23 12:28:49.000000000 -0800
164@@ -332,7 +332,7 @@
165 }
166 
167 static int pcf_xfer(struct i2c_adapter *i2c_adap,
168-                   struct i2c_msg msgs[],
169+                   struct i2c_msg *msgs,
170                    int num)
171 {
172        struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;
173--- ./drivers/i2c/algos/i2c-algo-ite.c.sav      2005-02-23 12:07:17.000000000 -0800
174+++ ./drivers/i2c/algos/i2c-algo-ite.c  2005-02-23 12:29:31.000000000 -0800
175@@ -490,7 +490,7 @@
176  * condition.
177  */
178 #if 0
179-static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
180+static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
181 {
182    int i;
183    struct i2c_msg *pmsg;
184@@ -600,7 +600,7 @@
185  * verify that the bus is not busy or in some unknown state.
186  */
187 static int iic_xfer(struct i2c_adapter *i2c_adap,
188-                   struct i2c_msg msgs[],
189+                   struct i2c_msg *msgs,
190                    int num)
191 {
192        struct i2c_algo_iic_data *adap = i2c_adap->algo_data;
193--- ./drivers/i2c/algos/i2c-algo-sgi.c.sav      2005-02-23 12:07:40.000000000 -0800
194+++ ./drivers/i2c/algos/i2c-algo-sgi.c  2005-02-23 12:29:58.000000000 -0800
195@@ -131,7 +131,7 @@
196        return 0;
197 }
198 
199-static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[],
200+static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
201                    int num)
202 {
203        struct i2c_algo_sgi_data *adap = i2c_adap->algo_data;
204--- ./drivers/media/video/saa7134/saa7134-i2c.c.sav     2005-02-23 12:08:12.000000000 -0800
205+++ ./drivers/media/video/saa7134/saa7134-i2c.c 2005-02-23 12:30:20.000000000 -0800
206@@ -236,7 +236,7 @@
207 }
208 
209 static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
210-                           struct i2c_msg msgs[], int num)
211+                           struct i2c_msg *msgs, int num)
212 {
213        struct saa7134_dev *dev = i2c_adap->algo_data;
214        enum i2c_status status;
215--- ./drivers/media/video/bttv-i2c.c.sav        2005-02-23 12:08:29.000000000 -0800
216+++ ./drivers/media/video/bttv-i2c.c    2005-02-23 12:30:56.000000000 -0800
217@@ -245,7 +245,7 @@
218                return retval;
219 }
220 
221-static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
222+static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
223 {
224        struct bttv *btv = i2c_get_adapdata(i2c_adap);
225        int retval = 0;
226--- ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c.sav  2005-02-23 12:09:43.000000000 -0800
227+++ ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c      2005-02-23 12:31:38.000000000 -0800
228@@ -38,7 +38,7 @@
229 /*
230  * I2C master xfer function
231  */
232-static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
233+static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num)
234 {
235        struct usb_dibusb *dib = i2c_get_adapdata(adap);
236        int i;
237--- ./drivers/media/common/saa7146_i2c.c.sav    2005-02-23 12:10:06.000000000 -0800
238+++ ./drivers/media/common/saa7146_i2c.c        2005-02-23 12:32:45.000000000 -0800
239@@ -25,7 +25,7 @@
240    sent through the saa7146. have a look at the specifications p. 122 ff
241    to understand this. it returns the number of u32s to send, or -1
242    in case of an error. */
243-static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op)
244+static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, u32 *op)
245 {
246        int h1, h2;
247        int i, j, addr;
248@@ -89,7 +89,7 @@
249    which bytes were read through the adapter and write them back to the corresponding
250    i2c-message. but instead, we simply write back all bytes.
251    fixme: this could be improved. */
252-static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op)
253+static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, u32 *op)
254 {
255        int i, j;
256        int op_count = 0;
257@@ -272,7 +272,7 @@
258        return 0;
259 }
260 
261-int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], int num, int retries)
262+int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries)
263 {
264        int i = 0, count = 0;
265        u32* buffer = dev->d_i2c.cpu_addr;
266@@ -372,7 +372,7 @@
267 }
268 
269 /* utility functions */
270-static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
271+static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num)
272 {
273        struct saa7146_dev* dev = i2c_get_adapdata(adapter);
274       
275
Note: See TracBrowser for help on using the repository browser.