Skip to content

Commit b7c2551

Browse files
committed
Update declaration of some structs, fix format is single-line if statements, and fix format of comments
1 parent cbdda1f commit b7c2551

File tree

1 file changed

+20
-29
lines changed

1 file changed

+20
-29
lines changed

drivers/platform/linux/linux_gpio.c

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ int32_t linux_gpio_get(struct no_os_gpio_desc **desc,
7373
char path[64];
7474
int ret;
7575
int timeout;
76-
struct gpiochip_info chip_info;
77-
struct gpio_v2_line_info line_info;
78-
struct gpio_v2_line_request line_request;
76+
struct gpiochip_info chip_info = {0};
77+
struct gpio_v2_line_info line_info = {0};
78+
struct gpio_v2_line_request line_request = {0};
7979

8080
descriptor = no_os_calloc(1, sizeof(*descriptor));
8181
if (!descriptor)
@@ -101,25 +101,22 @@ int32_t linux_gpio_get(struct no_os_gpio_desc **desc,
101101
goto close_dir;
102102
}
103103

104-
// Get Chip Info
105-
memset(&chip_info, 0, sizeof(chip_info));
104+
/* Get Chip Info */
106105
ret = ioctl(linux_desc->chip_fd, GPIO_GET_CHIPINFO_IOCTL, &chip_info);
107106
if (ret < 0) {
108107
printf("%s: Can't get chipinfo\n\r", __func__);
109108
goto close_dir;
110109
}
111110

112-
// Get Line Info
113-
memset(&line_info, 0, sizeof(line_info));
111+
/* Get Line Info */
114112
line_info.offset = descriptor->number;
115113
ret = ioctl(linux_desc->chip_fd, GPIO_V2_GET_LINEINFO_IOCTL, &line_info);
116114
if (ret < 0) {
117115
printf("%s: Can't get lineinfo\n\r", __func__);
118116
goto close_dir;
119117
}
120118

121-
// Get Line Request
122-
memset(&line_request, 0, sizeof(line_request));
119+
/* Get Line Request */
123120
line_request.offsets[0] = descriptor->number;
124121
line_request.num_lines = 1;
125122
ret = ioctl(linux_desc->chip_fd, GPIO_V2_GET_LINE_IOCTL, &line_request);
@@ -200,14 +197,13 @@ int32_t linux_gpio_set_value(struct no_os_gpio_desc *desc,
200197
{
201198
struct linux_gpio_desc *linux_desc;
202199
int ret;
203-
struct gpio_v2_line_values line_value;
200+
struct gpio_v2_line_values line_value = {0};
204201

205202
linux_desc = desc->extra;
206203

207-
// Set Line Value
208-
memset(&line_value, 0, sizeof(line_value));
204+
/* Set Line Value */
209205
line_value.bits = value;
210-
line_value.mask = 1; // Only set one line (or one GPIO)
206+
line_value.mask = 1; /* Only set one line (or one GPIO) */
211207
ret = ioctl(linux_desc->line_fd, GPIO_V2_LINE_SET_VALUES_IOCTL, &line_value);
212208
if (ret < 0) {
213209
printf("%s: Can't set line value\n\r", __func__);
@@ -230,13 +226,12 @@ int32_t linux_gpio_get_value(struct no_os_gpio_desc *desc,
230226
{
231227
struct linux_gpio_desc *linux_desc;
232228
int ret;
233-
struct gpio_v2_line_values line_value;
229+
struct gpio_v2_line_values line_value = {0};
234230

235231
linux_desc = desc->extra;
236232

237-
// Get Line Value
238-
memset(&line_value, 0, sizeof(line_value));
239-
line_value.mask = 1; // Only get one line (or one GPIO)
233+
/* Get Line Value */
234+
line_value.mask = 1; /* Only get one line (or one GPIO) */
240235
ret = ioctl(linux_desc->line_fd, GPIO_V2_LINE_GET_VALUES_IOCTL, &line_value);
241236
if (ret < 0) {
242237
printf("%s: Can't get line value\n\r", __func__);
@@ -260,12 +255,11 @@ int32_t linux_gpio_direction_input(struct no_os_gpio_desc *desc)
260255
{
261256
struct linux_gpio_desc *linux_desc;
262257
int ret;
263-
struct gpio_v2_line_config line_config;
258+
struct gpio_v2_line_config line_config = {0};
264259

265260
linux_desc = desc->extra;
266261

267-
// Set Line Config
268-
memset(&line_config, 0, sizeof(line_config));
262+
/* Set Line Config */
269263
line_config.flags = GPIO_V2_LINE_FLAG_INPUT;
270264
ret = ioctl(linux_desc->line_fd, GPIO_V2_LINE_SET_CONFIG_IOCTL, &line_config);
271265
if (ret < 0) {
@@ -289,12 +283,11 @@ int32_t linux_gpio_direction_output(struct no_os_gpio_desc *desc,
289283
{
290284
struct linux_gpio_desc *linux_desc;
291285
int ret;
292-
struct gpio_v2_line_config line_config;
286+
struct gpio_v2_line_config line_config = {0};
293287

294288
linux_desc = desc->extra;
295289

296-
// Set Line Config
297-
memset(&line_config, 0, sizeof(line_config));
290+
/* Set Line Config */
298291
line_config.flags = GPIO_V2_LINE_FLAG_OUTPUT;
299292
ret = ioctl(linux_desc->line_fd, GPIO_V2_LINE_SET_CONFIG_IOCTL, &line_config);
300293
if (ret < 0) {
@@ -320,12 +313,11 @@ int32_t linux_gpio_get_direction(struct no_os_gpio_desc *desc,
320313
{
321314
struct linux_gpio_desc *linux_desc;
322315
int ret;
323-
struct gpio_v2_line_info line_info;
316+
struct gpio_v2_line_info line_info = {0};
324317

325318
linux_desc = desc->extra;
326319

327-
// Get Line Info
328-
memset(&line_info, 0, sizeof(line_info));
320+
/* Get Line Info */
329321
line_info.offset = desc->number;
330322
ret = ioctl(linux_desc->chip_fd, GPIO_V2_GET_LINEINFO_IOCTL, &line_info);
331323
if (ret < 0) {
@@ -334,11 +326,10 @@ int32_t linux_gpio_get_direction(struct no_os_gpio_desc *desc,
334326
return -1;
335327
}
336328

337-
if (line_info.flags & GPIO_V2_LINE_FLAG_OUTPUT) {
329+
if (line_info.flags & GPIO_V2_LINE_FLAG_OUTPUT)
338330
*direction = NO_OS_GPIO_OUT;
339-
} else if (line_info.flags & GPIO_V2_LINE_FLAG_INPUT) {
331+
else if (line_info.flags & GPIO_V2_LINE_FLAG_INPUT)
340332
*direction = NO_OS_GPIO_IN;
341-
}
342333

343334
return 0;
344335
}

0 commit comments

Comments
 (0)