aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/usb
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2012-07-16 06:58:31 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-07-20 06:31:05 -0400
commit194b9a4cb91713ddb60c9f98f7212f6d8cb8e05f (patch)
tree5d32819f28dac1346f827a35afe6f626b8dd807c /drivers/net/can/usb
parent769162e38b91e1d300752e666260fa6c7b203fbc (diff)
can: mark bittiming_const pointer in struct can_priv as const
This patch marks the bittiming_const pointer as in the struct can_pric as "const". This allows us to mark the struct can_bittiming_const in the CAN drivers as "const", too. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/usb')
-rw-r--r--drivers/net/can/usb/ems_usb.c2
-rw-r--r--drivers/net/can/usb/esd_usb2.c2
-rw-r--r--drivers/net/can/usb/peak_usb/pcan_usb_core.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 7ae65fc80032..086fa321677a 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -889,7 +889,7 @@ static const struct net_device_ops ems_usb_netdev_ops = {
889 .ndo_start_xmit = ems_usb_start_xmit, 889 .ndo_start_xmit = ems_usb_start_xmit,
890}; 890};
891 891
892static struct can_bittiming_const ems_usb_bittiming_const = { 892static const struct can_bittiming_const ems_usb_bittiming_const = {
893 .name = "ems_usb", 893 .name = "ems_usb",
894 .tseg1_min = 1, 894 .tseg1_min = 1,
895 .tseg1_max = 16, 895 .tseg1_max = 16,
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 09b1da5bc512..bd36e5517173 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -871,7 +871,7 @@ static const struct net_device_ops esd_usb2_netdev_ops = {
871 .ndo_start_xmit = esd_usb2_start_xmit, 871 .ndo_start_xmit = esd_usb2_start_xmit,
872}; 872};
873 873
874static struct can_bittiming_const esd_usb2_bittiming_const = { 874static const struct can_bittiming_const esd_usb2_bittiming_const = {
875 .name = "esd_usb2", 875 .name = "esd_usb2",
876 .tseg1_min = ESD_USB2_TSEG1_MIN, 876 .tseg1_min = ESD_USB2_TSEG1_MIN,
877 .tseg1_max = ESD_USB2_TSEG1_MAX, 877 .tseg1_max = ESD_USB2_TSEG1_MAX,
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
index a948c5a89401..4c775b620be2 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.h
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
@@ -45,7 +45,7 @@ struct peak_usb_adapter {
45 char *name; 45 char *name;
46 u32 device_id; 46 u32 device_id;
47 struct can_clock clock; 47 struct can_clock clock;
48 struct can_bittiming_const bittiming_const; 48 const struct can_bittiming_const bittiming_const;
49 unsigned int ctrl_count; 49 unsigned int ctrl_count;
50 50
51 int (*intf_probe)(struct usb_interface *intf); 51 int (*intf_probe)(struct usb_interface *intf);