tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

media: dvb-usb: make dvb_usb_device_properties const

This makes it possible to declare dvb_usb_device_properties const.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Sean Young and committed by
Mauro Carvalho Chehab d27958df 96f3a939

+60 -45
+4 -2
drivers/media/usb/dvb-usb/a800.c
··· 27 27 } 28 28 29 29 /* assure to put cold to 0 for iManufacturer == 1 */ 30 - static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props, 31 - struct dvb_usb_device_description **desc, int *cold) 30 + static int a800_identify_state(struct usb_device *udev, 31 + const struct dvb_usb_device_properties *props, 32 + const struct dvb_usb_device_description **desc, 33 + int *cold) 32 34 { 33 35 *cold = udev->descriptor.iManufacturer != 1; 34 36 return 0;
+2 -2
drivers/media/usb/dvb-usb/af9005.c
··· 955 955 } 956 956 957 957 static int af9005_identify_state(struct usb_device *udev, 958 - struct dvb_usb_device_properties *props, 959 - struct dvb_usb_device_description **desc, 958 + const struct dvb_usb_device_properties *props, 959 + const struct dvb_usb_device_description **desc, 960 960 int *cold) 961 961 { 962 962 int ret;
+2 -2
drivers/media/usb/dvb-usb/az6027.c
··· 1051 1051 }; 1052 1052 1053 1053 static int az6027_identify_state(struct usb_device *udev, 1054 - struct dvb_usb_device_properties *props, 1055 - struct dvb_usb_device_description **desc, 1054 + const struct dvb_usb_device_properties *props, 1055 + const struct dvb_usb_device_description **desc, 1056 1056 int *cold) 1057 1057 { 1058 1058 u8 *b;
+2 -2
drivers/media/usb/dvb-usb/cxusb.c
··· 1358 1358 * not, and forget a match if it turns out we selected the wrong device. 1359 1359 */ 1360 1360 static int bluebird_fx2_identify_state(struct usb_device *udev, 1361 - struct dvb_usb_device_properties *props, 1362 - struct dvb_usb_device_description **desc, 1361 + const struct dvb_usb_device_properties *props, 1362 + const struct dvb_usb_device_description **desc, 1363 1363 int *cold) 1364 1364 { 1365 1365 int wascold = *cold;
+18 -13
drivers/media/usb/dvb-usb/dib0700.h
··· 52 52 struct i2c_client *i2c_client_tuner; 53 53 }; 54 54 55 - extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, 56 - u32 *romversion, u32 *ramversion, u32 *fwtype); 57 - extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val); 58 - extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3); 59 - extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen); 60 - extern int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw); 61 - extern int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf); 62 - extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff); 63 - extern struct i2c_algorithm dib0700_i2c_algo; 64 - extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props, 65 - struct dvb_usb_device_description **desc, int *cold); 66 - extern int dib0700_change_protocol(struct rc_dev *dev, u64 *rc_proto); 67 - extern int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz); 55 + int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, 56 + u32 *romversion, u32 *ramversion, u32 *fwtype); 57 + int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, 58 + u8 gpio_dir, u8 gpio_val); 59 + int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3); 60 + int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, 61 + u8 rxlen); 62 + int dib0700_download_firmware(struct usb_device *d, 63 + const struct firmware *fw); 64 + int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf); 65 + int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff); 66 + int dib0700_identify_state(struct usb_device *d, 67 + const struct dvb_usb_device_properties *props, 68 + const struct dvb_usb_device_description **desc, 69 + int *cold); 70 + int dib0700_change_protocol(struct rc_dev *dev, u64 *rc_proto); 71 + int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz); 68 72 73 + extern struct i2c_algorithm dib0700_i2c_algo; 69 74 extern int dib0700_device_count; 70 75 extern int dvb_usb_dib0700_ir_proto; 71 76 extern struct dvb_usb_device_properties dib0700_devices[];
+4 -2
drivers/media/usb/dvb-usb/dib0700_core.c
··· 372 372 .functionality = dib0700_i2c_func, 373 373 }; 374 374 375 - int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props, 376 - struct dvb_usb_device_description **desc, int *cold) 375 + int dib0700_identify_state(struct usb_device *udev, 376 + const struct dvb_usb_device_properties *props, 377 + const struct dvb_usb_device_description **desc, 378 + int *cold) 377 379 { 378 380 s16 ret; 379 381 u8 *b;
+4 -3
drivers/media/usb/dvb-usb/digitv.c
··· 90 90 }; 91 91 92 92 /* Callbacks for DVB USB */ 93 - static int digitv_identify_state (struct usb_device *udev, struct 94 - dvb_usb_device_properties *props, struct dvb_usb_device_description **desc, 95 - int *cold) 93 + static int digitv_identify_state(struct usb_device *udev, 94 + const struct dvb_usb_device_properties *props, 95 + const struct dvb_usb_device_description **desc, 96 + int *cold) 96 97 { 97 98 *cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0; 98 99 return 0;
+2 -1
drivers/media/usb/dvb-usb/dvb-usb-common.h
··· 26 26 #define deb_uxfer(args...) dprintk(dvb_usb_debug,0x100,args) 27 27 28 28 /* commonly used methods */ 29 - extern int dvb_usb_download_firmware(struct usb_device *, struct dvb_usb_device_properties *); 29 + int dvb_usb_download_firmware(struct usb_device *udev, 30 + const struct dvb_usb_device_properties *props); 30 31 31 32 extern int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff); 32 33
+2 -1
drivers/media/usb/dvb-usb/dvb-usb-firmware.c
··· 84 84 } 85 85 EXPORT_SYMBOL(usb_cypress_load_firmware); 86 86 87 - int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_properties *props) 87 + int dvb_usb_download_firmware(struct usb_device *udev, 88 + const struct dvb_usb_device_properties *props) 88 89 { 89 90 int ret; 90 91 const struct firmware *fw = NULL;
+4 -4
drivers/media/usb/dvb-usb/dvb-usb-init.c
··· 184 184 } 185 185 186 186 /* determine the name and the state of the just found USB device */ 187 - static struct dvb_usb_device_description *dvb_usb_find_device(struct usb_device *udev, struct dvb_usb_device_properties *props, int *cold) 187 + static const struct dvb_usb_device_description *dvb_usb_find_device(struct usb_device *udev, const struct dvb_usb_device_properties *props, int *cold) 188 188 { 189 189 int i, j; 190 - struct dvb_usb_device_description *desc = NULL; 190 + const struct dvb_usb_device_description *desc = NULL; 191 191 192 192 *cold = -1; 193 193 ··· 242 242 * USB 243 243 */ 244 244 int dvb_usb_device_init(struct usb_interface *intf, 245 - struct dvb_usb_device_properties *props, 245 + const struct dvb_usb_device_properties *props, 246 246 struct module *owner, struct dvb_usb_device **du, 247 247 short *adapter_nums) 248 248 { 249 249 struct usb_device *udev = interface_to_usbdev(intf); 250 250 struct dvb_usb_device *d = NULL; 251 - struct dvb_usb_device_description *desc = NULL; 251 + const struct dvb_usb_device_description *desc = NULL; 252 252 253 253 int ret = -ENOMEM, cold = 0; 254 254
+6 -4
drivers/media/usb/dvb-usb/dvb-usb.h
··· 291 291 292 292 int (*power_ctrl) (struct dvb_usb_device *, int); 293 293 int (*read_mac_address) (struct dvb_usb_device *, u8 []); 294 - int (*identify_state) (struct usb_device *, struct dvb_usb_device_properties *, 295 - struct dvb_usb_device_description **, int *); 294 + int (*identify_state)(struct usb_device *udev, 295 + const struct dvb_usb_device_properties *props, 296 + const struct dvb_usb_device_description **desc, 297 + int *cold); 296 298 297 299 struct { 298 300 enum dvb_usb_mode mode; /* Drivers shouldn't touch on it */ ··· 438 436 */ 439 437 struct dvb_usb_device { 440 438 struct dvb_usb_device_properties props; 441 - struct dvb_usb_device_description *desc; 439 + const struct dvb_usb_device_description *desc; 442 440 443 441 struct usb_device *udev; 444 442 ··· 475 473 }; 476 474 477 475 extern int dvb_usb_device_init(struct usb_interface *, 478 - struct dvb_usb_device_properties *, 476 + const struct dvb_usb_device_properties *, 479 477 struct module *, struct dvb_usb_device **, 480 478 short *adapter_nums); 481 479 extern void dvb_usb_device_exit(struct usb_interface *);
+2 -2
drivers/media/usb/dvb-usb/dw2102.c
··· 955 955 } 956 956 957 957 static int su3000_identify_state(struct usb_device *udev, 958 - struct dvb_usb_device_properties *props, 959 - struct dvb_usb_device_description **desc, 958 + const struct dvb_usb_device_properties *props, 959 + const struct dvb_usb_device_description **desc, 960 960 int *cold) 961 961 { 962 962 info("%s", __func__);
+2 -2
drivers/media/usb/dvb-usb/m920x.c
··· 459 459 460 460 /* Callbacks for DVB USB */ 461 461 static int m920x_identify_state(struct usb_device *udev, 462 - struct dvb_usb_device_properties *props, 463 - struct dvb_usb_device_description **desc, 462 + const struct dvb_usb_device_properties *props, 463 + const struct dvb_usb_device_description **desc, 464 464 int *cold) 465 465 { 466 466 struct usb_host_interface *alt;
+2 -2
drivers/media/usb/dvb-usb/technisat-usb2.c
··· 330 330 331 331 /* method to find out whether the firmware has to be downloaded or not */ 332 332 static int technisat_usb2_identify_state(struct usb_device *udev, 333 - struct dvb_usb_device_properties *props, 334 - struct dvb_usb_device_description **desc, int *cold) 333 + const struct dvb_usb_device_properties *props, 334 + const struct dvb_usb_device_description **desc, int *cold) 335 335 { 336 336 int ret; 337 337 u8 *version;
+4 -3
drivers/media/usb/dvb-usb/ttusb2.c
··· 467 467 468 468 469 469 /* Callbacks for DVB USB */ 470 - static int ttusb2_identify_state (struct usb_device *udev, struct 471 - dvb_usb_device_properties *props, struct dvb_usb_device_description **desc, 472 - int *cold) 470 + static int ttusb2_identify_state(struct usb_device *udev, 471 + const struct dvb_usb_device_properties *props, 472 + const struct dvb_usb_device_description **desc, 473 + int *cold) 473 474 { 474 475 *cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0; 475 476 return 0;