aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
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
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')
-rw-r--r--drivers/net/can/at91_can.c2
-rw-r--r--drivers/net/can/bfin_can.c2
-rw-r--r--drivers/net/can/c_can/c_can.c2
-rw-r--r--drivers/net/can/cc770/cc770.c2
-rw-r--r--drivers/net/can/flexcan.c2
-rw-r--r--drivers/net/can/janz-ican3.c2
-rw-r--r--drivers/net/can/mcp251x.c2
-rw-r--r--drivers/net/can/mscan/mscan.c2
-rw-r--r--drivers/net/can/pch_can.c2
-rw-r--r--drivers/net/can/sja1000/sja1000.c2
-rw-r--r--drivers/net/can/ti_hecc.c2
-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
14 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 6ea905c2cf6d..fcff73a73b1d 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -170,7 +170,7 @@ static const struct at91_devtype_data at91_devtype_data[] __devinitconst = {
170 }, 170 },
171}; 171};
172 172
173static struct can_bittiming_const at91_bittiming_const = { 173static const struct can_bittiming_const at91_bittiming_const = {
174 .name = KBUILD_MODNAME, 174 .name = KBUILD_MODNAME,
175 .tseg1_min = 4, 175 .tseg1_min = 4,
176 .tseg1_max = 16, 176 .tseg1_max = 16,
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index ea3143895e6d..f2d6d258a286 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -44,7 +44,7 @@ struct bfin_can_priv {
44/* 44/*
45 * bfin can timing parameters 45 * bfin can timing parameters
46 */ 46 */
47static struct can_bittiming_const bfin_can_bittiming_const = { 47static const struct can_bittiming_const bfin_can_bittiming_const = {
48 .name = DRV_NAME, 48 .name = DRV_NAME,
49 .tseg1_min = 1, 49 .tseg1_min = 1,
50 .tseg1_max = 16, 50 .tseg1_max = 16,
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index eea660800a09..4c538e388655 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -189,7 +189,7 @@ enum c_can_bus_error_types {
189 C_CAN_ERROR_PASSIVE, 189 C_CAN_ERROR_PASSIVE,
190}; 190};
191 191
192static struct can_bittiming_const c_can_bittiming_const = { 192static const struct can_bittiming_const c_can_bittiming_const = {
193 .name = KBUILD_MODNAME, 193 .name = KBUILD_MODNAME,
194 .tseg1_min = 2, /* Time segment 1 = prop_seg + phase_seg1 */ 194 .tseg1_min = 2, /* Time segment 1 = prop_seg + phase_seg1 */
195 .tseg1_max = 16, 195 .tseg1_max = 16,
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index a138db11cbf0..0f12abf6591c 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -90,7 +90,7 @@ static unsigned char cc770_obj_flags[CC770_OBJ_MAX] = {
90 [CC770_OBJ_TX] = 0, 90 [CC770_OBJ_TX] = 0,
91}; 91};
92 92
93static struct can_bittiming_const cc770_bittiming_const = { 93static const struct can_bittiming_const cc770_bittiming_const = {
94 .name = KBUILD_MODNAME, 94 .name = KBUILD_MODNAME,
95 .tseg1_min = 1, 95 .tseg1_min = 1,
96 .tseg1_max = 16, 96 .tseg1_max = 16,
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 1b6f5621ce89..c8a6fc72606d 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -203,7 +203,7 @@ static struct flexcan_devtype_data fsl_imx6q_devtype_data = {
203 .hw_ver = 10, 203 .hw_ver = 10,
204}; 204};
205 205
206static struct can_bittiming_const flexcan_bittiming_const = { 206static const struct can_bittiming_const flexcan_bittiming_const = {
207 .name = DRV_NAME, 207 .name = DRV_NAME,
208 .tseg1_min = 4, 208 .tseg1_min = 4,
209 .tseg1_max = 16, 209 .tseg1_max = 16,
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 08c893cb7896..e7d1532d5f1b 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1490,7 +1490,7 @@ static const struct net_device_ops ican3_netdev_ops = {
1490 */ 1490 */
1491 1491
1492/* This structure was stolen from drivers/net/can/sja1000/sja1000.c */ 1492/* This structure was stolen from drivers/net/can/sja1000/sja1000.c */
1493static struct can_bittiming_const ican3_bittiming_const = { 1493static const struct can_bittiming_const ican3_bittiming_const = {
1494 .name = DRV_NAME, 1494 .name = DRV_NAME,
1495 .tseg1_min = 1, 1495 .tseg1_min = 1,
1496 .tseg1_max = 16, 1496 .tseg1_max = 16,
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 9120a36ec702..a580db29e503 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -214,7 +214,7 @@ static int mcp251x_enable_dma; /* Enable SPI DMA. Default: 0 (Off) */
214module_param(mcp251x_enable_dma, int, S_IRUGO); 214module_param(mcp251x_enable_dma, int, S_IRUGO);
215MODULE_PARM_DESC(mcp251x_enable_dma, "Enable SPI DMA. Default: 0 (Off)"); 215MODULE_PARM_DESC(mcp251x_enable_dma, "Enable SPI DMA. Default: 0 (Off)");
216 216
217static struct can_bittiming_const mcp251x_bittiming_const = { 217static const struct can_bittiming_const mcp251x_bittiming_const = {
218 .name = DEVICE_NAME, 218 .name = DEVICE_NAME,
219 .tseg1_min = 3, 219 .tseg1_min = 3,
220 .tseg1_max = 16, 220 .tseg1_max = 16,
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 41a2a2dda7ea..2b104d5f422c 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -34,7 +34,7 @@
34 34
35#include "mscan.h" 35#include "mscan.h"
36 36
37static struct can_bittiming_const mscan_bittiming_const = { 37static const struct can_bittiming_const mscan_bittiming_const = {
38 .name = "mscan", 38 .name = "mscan",
39 .tseg1_min = 4, 39 .tseg1_min = 4,
40 .tseg1_max = 16, 40 .tseg1_max = 16,
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 1226297e7676..48b3d62b34cb 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -184,7 +184,7 @@ struct pch_can_priv {
184 int use_msi; 184 int use_msi;
185}; 185};
186 186
187static struct can_bittiming_const pch_can_bittiming_const = { 187static const struct can_bittiming_const pch_can_bittiming_const = {
188 .name = KBUILD_MODNAME, 188 .name = KBUILD_MODNAME,
189 .tseg1_min = 2, 189 .tseg1_min = 2,
190 .tseg1_max = 16, 190 .tseg1_max = 16,
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 5e10472371ed..4c4f33d482d2 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -69,7 +69,7 @@ MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
69MODULE_LICENSE("Dual BSD/GPL"); 69MODULE_LICENSE("Dual BSD/GPL");
70MODULE_DESCRIPTION(DRV_NAME "CAN netdevice driver"); 70MODULE_DESCRIPTION(DRV_NAME "CAN netdevice driver");
71 71
72static struct can_bittiming_const sja1000_bittiming_const = { 72static const struct can_bittiming_const sja1000_bittiming_const = {
73 .name = DRV_NAME, 73 .name = DRV_NAME,
74 .tseg1_min = 1, 74 .tseg1_min = 1,
75 .tseg1_max = 16, 75 .tseg1_max = 16,
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 4accd7ec6954..527dbcf95335 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -196,7 +196,7 @@ MODULE_VERSION(HECC_MODULE_VERSION);
196#define HECC_CANGIM_SIL BIT(2) /* system interrupts to int line 1 */ 196#define HECC_CANGIM_SIL BIT(2) /* system interrupts to int line 1 */
197 197
198/* CAN Bittiming constants as per HECC specs */ 198/* CAN Bittiming constants as per HECC specs */
199static struct can_bittiming_const ti_hecc_bittiming_const = { 199static const struct can_bittiming_const ti_hecc_bittiming_const = {
200 .name = DRV_NAME, 200 .name = DRV_NAME,
201 .tseg1_min = 1, 201 .tseg1_min = 1,
202 .tseg1_max = 16, 202 .tseg1_max = 16,
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);