can: peak_usb: constify struct peak_usb_adapter
authorMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 27 Jan 2015 16:15:39 +0000 (17:15 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 28 Jan 2015 13:47:05 +0000 (14:47 +0100)
A "struct peak_usb_adapter" describes a certain USB adapter, as this doesn't
change during runtime, this patch marks all USB adapter definitions as const.

Acked-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/peak_usb/pcan_usb.c
drivers/net/can/usb/peak_usb/pcan_usb_core.c
drivers/net/can/usb/peak_usb/pcan_usb_core.h
drivers/net/can/usb/peak_usb/pcan_usb_pro.c

index 2a1c9ce53fae083b34fb6d14fda73636dd3a1f57..d57d3f64a5bfc2661617105d5fc89f4efe65dde4 100644 (file)
@@ -855,7 +855,7 @@ static int pcan_usb_probe(struct usb_interface *intf)
 /*
  * describe the PCAN-USB adapter
  */
-struct peak_usb_adapter pcan_usb = {
+const struct peak_usb_adapter pcan_usb = {
        .name = "PCAN-USB",
        .device_id = PCAN_USB_PRODUCT_ID,
        .ctrl_count = 1,
index 26c0cc3ce3b2e7fc6da15f44af43ac6aa27b9c82..729b80d78322669cb563ccf88cb02d8f909a7b9a 100644 (file)
@@ -43,7 +43,7 @@ static struct usb_device_id peak_usb_table[] = {
 MODULE_DEVICE_TABLE(usb, peak_usb_table);
 
 /* List of supported PCAN-USB adapters (NULL terminated list) */
-static struct peak_usb_adapter *peak_usb_adapters_list[] = {
+static const struct peak_usb_adapter *const peak_usb_adapters_list[] = {
        &pcan_usb,
        &pcan_usb_pro,
 };
@@ -64,7 +64,7 @@ void pcan_dump_mem(char *prompt, void *p, int l)
  * initialize a time_ref object with usb adapter own settings
  */
 void peak_usb_init_time_ref(struct peak_time_ref *time_ref,
-                           struct peak_usb_adapter *adapter)
+                           const struct peak_usb_adapter *adapter)
 {
        if (time_ref) {
                memset(time_ref, 0, sizeof(struct peak_time_ref));
@@ -708,7 +708,7 @@ static const struct net_device_ops peak_usb_netdev_ops = {
  * create one device which is attached to CAN controller #ctrl_idx of the
  * usb adapter.
  */
-static int peak_usb_create_dev(struct peak_usb_adapter *peak_usb_adapter,
+static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
                               struct usb_interface *intf, int ctrl_idx)
 {
        struct usb_device *usb_dev = interface_to_usbdev(intf);
@@ -856,7 +856,7 @@ static int peak_usb_probe(struct usb_interface *intf,
 {
        struct usb_device *usb_dev = interface_to_usbdev(intf);
        const u16 usb_id_product = le16_to_cpu(usb_dev->descriptor.idProduct);
-       struct peak_usb_adapter *peak_usb_adapter = NULL;
+       const struct peak_usb_adapter *peak_usb_adapter = NULL;
        int i, err = -ENOMEM;
 
        usb_dev = interface_to_usbdev(intf);
index 073b47ff8eee3065b2bf9f1319fc7207c93c2aa8..10f2fcac7c13d09f917c951260b80bf3bff7d993 100644 (file)
@@ -78,15 +78,15 @@ struct peak_usb_adapter {
        int sizeof_dev_private;
 };
 
-extern struct peak_usb_adapter pcan_usb;
-extern struct peak_usb_adapter pcan_usb_pro;
+extern const struct peak_usb_adapter pcan_usb;
+extern const struct peak_usb_adapter pcan_usb_pro;
 
 struct peak_time_ref {
        struct timeval tv_host_0, tv_host;
        u32 ts_dev_1, ts_dev_2;
        u64 ts_total;
        u32 tick_count;
-       struct peak_usb_adapter *adapter;
+       const struct peak_usb_adapter *adapter;
 };
 
 struct peak_tx_urb_context {
@@ -102,7 +102,7 @@ struct peak_tx_urb_context {
 /* PEAK-System USB device */
 struct peak_usb_device {
        struct can_priv can;
-       struct peak_usb_adapter *adapter;
+       const struct peak_usb_adapter *adapter;
        unsigned int ctrl_idx;
        u32 state;
 
@@ -134,7 +134,7 @@ void pcan_dump_mem(char *prompt, void *p, int l);
 
 /* common timestamp management */
 void peak_usb_init_time_ref(struct peak_time_ref *time_ref,
-                           struct peak_usb_adapter *adapter);
+                           const struct peak_usb_adapter *adapter);
 void peak_usb_update_ts_now(struct peak_time_ref *time_ref, u32 ts_now);
 void peak_usb_set_ts_now(struct peak_time_ref *time_ref, u32 ts_now);
 void peak_usb_get_ts_tv(struct peak_time_ref *time_ref, u32 ts,
index 145fa87c31b9721238a0a4ebb74efa6ebe626b03..56855b2b1fa1180b22851ee9fffa9a1636289569 100644 (file)
@@ -1012,7 +1012,7 @@ static int pcan_usb_pro_probe(struct usb_interface *intf)
 /*
  * describe the PCAN-USB Pro adapter
  */
-struct peak_usb_adapter pcan_usb_pro = {
+const struct peak_usb_adapter pcan_usb_pro = {
        .name = "PCAN-USB Pro",
        .device_id = PCAN_USBPRO_PRODUCT_ID,
        .ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,