Commit d27958df authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

media: dvb-usb: make dvb_usb_device_properties const 



This makes it possible to declare dvb_usb_device_properties const.

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 96f3a939

drivers/media/usb/dvb-usb/a800.c

+4 −2
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ static int a800_power_ctrl(struct dvb_usb_device *d, int onoff) 
}



/* assure to put cold to 0 for iManufacturer == 1 */

static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,

	struct dvb_usb_device_description **desc, int *cold)

static int a800_identify_state(struct usb_device *udev,

			       const struct dvb_usb_device_properties *props,

			       const struct dvb_usb_device_description **desc,

			       int *cold)

{

	*cold = udev->descriptor.iManufacturer != 1;

	return 0;

drivers/media/usb/dvb-usb/af9005.c

+2 −2
Original line number Diff line number Diff line
@@ -955,8 +955,8 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, 
}



static int af9005_identify_state(struct usb_device *udev,

				 struct dvb_usb_device_properties *props,

				 struct dvb_usb_device_description **desc,

				 const struct dvb_usb_device_properties *props,

				 const struct dvb_usb_device_description **desc,

				 int *cold)

{

	int ret;

drivers/media/usb/dvb-usb/az6027.c

+2 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,8 @@ static struct i2c_algorithm az6027_i2c_algo = { 
};



static int az6027_identify_state(struct usb_device *udev,

				 struct dvb_usb_device_properties *props,

				 struct dvb_usb_device_description **desc,

				 const struct dvb_usb_device_properties *props,

				 const struct dvb_usb_device_description **desc,

				 int *cold)

{

	u8 *b;

drivers/media/usb/dvb-usb/cxusb.c

+2 −2
Original line number Diff line number Diff line
@@ -1358,8 +1358,8 @@ static int cxusb_mygica_d689_frontend_attach(struct dvb_usb_adapter *adap) 
 * not, and forget a match if it turns out we selected the wrong device.

 */

static int bluebird_fx2_identify_state(struct usb_device *udev,

				       struct dvb_usb_device_properties *props,

				       struct dvb_usb_device_description **desc,

				       const struct dvb_usb_device_properties *props,

				       const struct dvb_usb_device_description **desc,

				       int *cold)

{

	int wascold = *cold;

drivers/media/usb/dvb-usb/dib0700.h

+18 −13
Original line number Diff line number Diff line
@@ -52,20 +52,25 @@ struct dib0700_state { 
	struct i2c_client *i2c_client_tuner;

};



extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,

int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,

			u32 *romversion, u32 *ramversion, u32 *fwtype);

extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val);

extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3);

extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen);

extern int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw);

extern int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf);

extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);

extern struct i2c_algorithm dib0700_i2c_algo;

extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,

			struct dvb_usb_device_description **desc, int *cold);

extern int dib0700_change_protocol(struct rc_dev *dev, u64 *rc_proto);

extern int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz);

int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio,

		     u8 gpio_dir, u8 gpio_val);

int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3);

int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx,

		    u8 rxlen);

int dib0700_download_firmware(struct usb_device *d,

			      const struct firmware *fw);

int dib0700_rc_setup(struct dvb_usb_device *d, struct usb_interface *intf);

int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);

int dib0700_identify_state(struct usb_device *d,

			   const struct dvb_usb_device_properties *props,

			   const struct dvb_usb_device_description **desc,

			   int *cold);

int dib0700_change_protocol(struct rc_dev *dev, u64 *rc_proto);

int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz);



extern struct i2c_algorithm dib0700_i2c_algo;

extern int dib0700_device_count;

extern int dvb_usb_dib0700_ir_proto;

extern struct dvb_usb_device_properties dib0700_devices[];