michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: Fix structure attributes access

Browse source 
Since struct devconfig was merged earlier into struct device, let's fix
accessing config_info, name, ... attributes everywhere via:

grep -rlZ 'dev->config->' | xargs -0 sed -i 's/dev->config->/dev->/g'

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-03-09 12:49:07 +01:00 • committed by Carles Cufí
commit 97326c0445
348 changed files with 1155 additions and 1174 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/can/can_loopback.c
View file

@ -98,7 +98,7 @@ int can_loopback_send(struct device *dev, const struct zcan_frame *frame,
struct k_sem tx_sem;
LOG_DBG("Sending %d bytes on %s. Id: 0x%x, ID type: %s %s",
frame->dlc, dev->config->name,
frame->dlc, dev->name,
frame->id_type == CAN_STANDARD_IDENTIFIER ?
frame->std_id : frame->ext_id,
frame->id_type == CAN_STANDARD_IDENTIFIER ?
@ -267,7 +267,8 @@ static int can_loopback_init(struct device *dev)
return -1;
}
LOG_INF("Init of %s done", dev->config->name);
LOG_INF("Init of %s done", dev->name);
return 0;
}
@ -290,7 +291,7 @@ static int socket_can_init_1(struct device *dev)
struct socket_can_context *socket_context = dev->driver_data;
LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)",
dev, dev->config->name, can_dev, can_dev->config->name);
dev, dev->name, can_dev, can_dev->name);
socket_context->can_dev = can_dev;
socket_context->msgq = &socket_can_msgq;

2
drivers/can/can_loopback.h
View file

@ -12,7 +12,7 @@
#define DEV_DATA(dev) ((struct can_loopback_data *const)(dev)->driver_data)
#define DEV_CFG(dev) \
((const struct can_loopback_config *const)(dev)->config->config_info)
((const struct can_loopback_config *const)(dev)->config_info)
struct can_loopback_filter {
can_rx_callback_t rx_cb;

2
drivers/can/can_mcp2515.h
View file

@ -15,7 +15,7 @@
#define MCP2515_FRAME_LEN 13
#define DEV_CFG(dev) \
((const struct mcp2515_config *const)(dev)->config->config_info)
((const struct mcp2515_config *const)(dev)->config_info)
#define DEV_DATA(dev) ((struct mcp2515_data *const)(dev)->driver_data)
struct mcp2515_tx_cb {

22
drivers/can/can_mcux_flexcan.c
View file

@ -95,7 +95,7 @@ struct mcux_flexcan_data {
static int mcux_flexcan_configure(struct device *dev, enum can_mode mode,
u32_t bitrate)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
flexcan_config_t flexcan_config;
struct device *clock_dev;
u32_t clock_freq;
@ -249,7 +249,7 @@ static int mcux_flexcan_send(struct device *dev, const struct zcan_frame *msg,
k_timeout_t timeout,
can_tx_callback_t callback_isr, void *callback_arg)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
flexcan_mb_transfer_t xfer;
status_t status;
@ -299,7 +299,7 @@ static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr,
void *callback_arg,
const struct zcan_filter *filter)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
flexcan_mb_transfer_t xfer;
status_t status;
@ -361,7 +361,7 @@ static void mcux_flexcan_register_state_change_isr(struct device *dev,
static enum can_state mcux_flexcan_get_state(struct device *dev,
struct can_bus_err_cnt *err_cnt)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
u32_t status_flags;
if (err_cnt) {
@ -386,7 +386,7 @@ static enum can_state mcux_flexcan_get_state(struct device *dev,
#ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY
int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
int ret = 0;
u64_t start_time;
@ -414,7 +414,7 @@ int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout)
static void mcux_flexcan_detach(struct device *dev, int filter_id)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
if (filter_id >= MCUX_FLEXCAN_MAX_RX) {
@ -443,7 +443,7 @@ static void mcux_flexcan_detach(struct device *dev, int filter_id)
static inline void mcux_flexcan_transfer_error_status(struct device *dev,
u32_t error)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
can_tx_callback_t function;
int status = CAN_TX_OK;
@ -545,7 +545,7 @@ static inline void mcux_flexcan_transfer_tx_idle(struct device *dev,
static inline void mcux_flexcan_transfer_rx_idle(struct device *dev,
u32_t mb)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
can_rx_callback_t function;
flexcan_mb_transfer_t xfer;
@ -606,7 +606,7 @@ static void mcux_flexcan_transfer_callback(CAN_Type *base,
static void mcux_flexcan_isr(void *arg)
{
struct device *dev = (struct device *)arg;
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
FLEXCAN_TransferHandleIRQ(config->base, &data->handle);
@ -614,7 +614,7 @@ static void mcux_flexcan_isr(void *arg)
static int mcux_flexcan_init(struct device *dev)
{
const struct mcux_flexcan_config *config = dev->config->config_info;
const struct mcux_flexcan_config *config = dev->config_info;
struct mcux_flexcan_data *data = dev->driver_data;
int err;
int i;
@ -733,7 +733,7 @@ static int socket_can_init_0(struct device *dev)
struct socket_can_context *socket_context = dev->driver_data;
LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)",
dev, dev->config->name, can_dev, can_dev->config->name);
dev, dev->name, can_dev, can_dev->name);
socket_context->can_dev = can_dev;
socket_context->msgq = &socket_can_msgq;

2
drivers/can/can_net.c
View file

@ -390,7 +390,7 @@ static int net_can_init(struct device *dev)
}
NET_DBG("Init net CAN device %p (%s) for dev %p (%s)",
dev, dev->config->name, can_dev, can_dev->config->name);
dev, dev->name, can_dev, can_dev->name);
ctx->can_dev = can_dev;

10
drivers/can/can_stm32.c
View file

@ -378,7 +378,7 @@ int can_stm32_runtime_configure(struct device *dev, enum can_mode mode,
goto done;
}
LOG_DBG("Runtime configure of %s done", dev->config->name);
LOG_DBG("Runtime configure of %s done", dev->name);
ret = 0;
done:
k_mutex_unlock(&data->inst_mutex);
@ -456,7 +456,7 @@ static int can_stm32_init(struct device *dev)
cfg->config_irq(can);
can->IER |= CAN_IER_TMEIE;
LOG_INF("Init of %s done", dev->config->name);
LOG_INF("Init of %s done", dev->name);
return 0;
}
@ -558,7 +558,7 @@ int can_stm32_send(struct device *dev, const struct zcan_frame *msg,
"Id: 0x%x, "
"ID type: %s, "
"Remote Frame: %s"
, msg->dlc, dev->config->name
, msg->dlc, dev->name
, msg->id_type == CAN_STANDARD_IDENTIFIER ?
msg->std_id : msg->ext_id
, msg->id_type == CAN_STANDARD_IDENTIFIER ?
@ -1112,7 +1112,7 @@ static int socket_can_init_1(struct device *dev)
struct socket_can_context *socket_context = dev->driver_data;
LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)",
dev, dev->config->name, can_dev, can_dev->config->name);
dev, dev->name, can_dev, can_dev->name);
socket_context->can_dev = can_dev;
socket_context->msgq = &socket_can_msgq;
@ -1196,7 +1196,7 @@ static int socket_can_init_2(struct device *dev)
struct socket_can_context *socket_context = dev->driver_data;
LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)",
dev, dev->config->name, can_dev, can_dev->config->name);
dev, dev->name, can_dev, can_dev->name);
socket_context->can_dev = can_dev;
socket_context->msgq = &socket_can_msgq;

2
drivers/can/can_stm32.h
View file

@ -12,7 +12,7 @@
#define DEV_DATA(dev) ((struct can_stm32_data *const)(dev)->driver_data)
#define DEV_CFG(dev) \
((const struct can_stm32_config *const)(dev)->config->config_info)
((const struct can_stm32_config *const)(dev)->config_info)
#define BIT_SEG_LENGTH(cfg) ((cfg)->prop_ts1 + (cfg)->ts2 + 1)