Skip to content

Commit 45ccd4a

Browse files
kartbennashif
authored andcommitted
drivers: display: ssd1306: do not re-declare errno
errno is a reserved macro. Use ret instead. Fixes a bug introduced with commit bfb541c. Fixes #76751. Signed-off-by: Benjamin Cabé <[email protected]>
1 parent cd931fd commit 45ccd4a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/display/ssd1306.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static bool ssd1306_bus_ready_spi(const struct device *dev)
107107
static int ssd1306_write_bus_spi(const struct device *dev, uint8_t *buf, size_t len, bool command)
108108
{
109109
const struct ssd1306_config *config = dev->config;
110-
int errno;
110+
int ret;
111111

112112
gpio_pin_set_dt(&config->data_cmd, command ? 0 : 1);
113113
struct spi_buf tx_buf = {
@@ -120,9 +120,9 @@ static int ssd1306_write_bus_spi(const struct device *dev, uint8_t *buf, size_t
120120
.count = 1
121121
};
122122

123-
errno = spi_write_dt(&config->bus.spi, &tx_bufs);
123+
ret = spi_write_dt(&config->bus.spi, &tx_bufs);
124124

125-
return errno;
125+
return ret;
126126
}
127127

128128
static const char *ssd1306_bus_name_spi(const struct device *dev)
@@ -204,18 +204,18 @@ static inline int ssd1306_set_charge_pump(const struct device *dev)
204204

205205
static inline int ssd1306_set_iref_mode(const struct device *dev)
206206
{
207-
int errno = 0;
207+
int ret = 0;
208208
const struct ssd1306_config *config = dev->config;
209209
uint8_t cmd_buf[] = {
210210
SSD1306_SET_IREF_MODE,
211211
SSD1306_SET_IREF_MODE_INTERNAL,
212212
};
213213

214214
if (config->use_internal_iref) {
215-
errno = ssd1306_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
215+
ret = ssd1306_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
216216
}
217217

218-
return errno;
218+
return ret;
219219
}
220220

221221
static int ssd1306_resume(const struct device *dev)

0 commit comments

Comments
 (0)