@@ -1199,18 +1199,18 @@ static int sisusb_read_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr,
1199
1199
/* High level: Gfx (indexed) register access */
1200
1200
1201
1201
#ifdef CONFIG_USB_SISUSBVGA_CON
1202
- int sisusb_setreg (struct sisusb_usb_data * sisusb , int port , u8 data )
1202
+ int sisusb_setreg (struct sisusb_usb_data * sisusb , u32 port , u8 data )
1203
1203
{
1204
1204
return sisusb_write_memio_byte (sisusb , SISUSB_TYPE_IO , port , data );
1205
1205
}
1206
1206
1207
- int sisusb_getreg (struct sisusb_usb_data * sisusb , int port , u8 * data )
1207
+ int sisusb_getreg (struct sisusb_usb_data * sisusb , u32 port , u8 * data )
1208
1208
{
1209
1209
return sisusb_read_memio_byte (sisusb , SISUSB_TYPE_IO , port , data );
1210
1210
}
1211
1211
#endif
1212
1212
1213
- int sisusb_setidxreg (struct sisusb_usb_data * sisusb , int port ,
1213
+ int sisusb_setidxreg (struct sisusb_usb_data * sisusb , u32 port ,
1214
1214
u8 index , u8 data )
1215
1215
{
1216
1216
int ret ;
@@ -1220,7 +1220,7 @@ int sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port,
1220
1220
return ret ;
1221
1221
}
1222
1222
1223
- int sisusb_getidxreg (struct sisusb_usb_data * sisusb , int port ,
1223
+ int sisusb_getidxreg (struct sisusb_usb_data * sisusb , u32 port ,
1224
1224
u8 index , u8 * data )
1225
1225
{
1226
1226
int ret ;
@@ -1230,7 +1230,7 @@ int sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port,
1230
1230
return ret ;
1231
1231
}
1232
1232
1233
- int sisusb_setidxregandor (struct sisusb_usb_data * sisusb , int port , u8 idx ,
1233
+ int sisusb_setidxregandor (struct sisusb_usb_data * sisusb , u32 port , u8 idx ,
1234
1234
u8 myand , u8 myor )
1235
1235
{
1236
1236
int ret ;
@@ -1245,7 +1245,7 @@ int sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,
1245
1245
}
1246
1246
1247
1247
static int sisusb_setidxregmask (struct sisusb_usb_data * sisusb ,
1248
- int port , u8 idx , u8 data , u8 mask )
1248
+ u32 port , u8 idx , u8 data , u8 mask )
1249
1249
{
1250
1250
int ret ;
1251
1251
u8 tmp ;
@@ -1258,13 +1258,13 @@ static int sisusb_setidxregmask(struct sisusb_usb_data *sisusb,
1258
1258
return ret ;
1259
1259
}
1260
1260
1261
- int sisusb_setidxregor (struct sisusb_usb_data * sisusb , int port ,
1261
+ int sisusb_setidxregor (struct sisusb_usb_data * sisusb , u32 port ,
1262
1262
u8 index , u8 myor )
1263
1263
{
1264
1264
return sisusb_setidxregandor (sisusb , port , index , 0xff , myor );
1265
1265
}
1266
1266
1267
- int sisusb_setidxregand (struct sisusb_usb_data * sisusb , int port ,
1267
+ int sisusb_setidxregand (struct sisusb_usb_data * sisusb , u32 port ,
1268
1268
u8 idx , u8 myand )
1269
1269
{
1270
1270
return sisusb_setidxregandor (sisusb , port , idx , myand , 0x00 );
@@ -2785,8 +2785,8 @@ static loff_t sisusb_lseek(struct file *file, loff_t offset, int orig)
2785
2785
static int sisusb_handle_command (struct sisusb_usb_data * sisusb ,
2786
2786
struct sisusb_command * y , unsigned long arg )
2787
2787
{
2788
- int retval , port , length ;
2789
- u32 address ;
2788
+ int retval , length ;
2789
+ u32 port , address ;
2790
2790
2791
2791
/* All our commands require the device
2792
2792
* to be initialized.
0 commit comments