Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/: Change some nerr() ERRORS to nwarn() WARNINGS. Anomolous network evernts are not errors.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-12 08:31:22 -06:00
parent b1eb4fdd8e
commit efb02f2ef1
55 changed files with 457 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/power/battery_charger.c
+2 -2
View File
@@ -228,7 +228,7 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd,
break;
default:
err("Unrecognized cmd: %d\n", cmd);
err("ERROR: Unrecognized cmd: %d\n", cmd);
ret = -ENOTTY;
break;
}
@@ -268,7 +268,7 @@ int battery_charger_register(FAR const char *devpath,
ret = register_driver(devpath, &g_batteryops, 0555, dev);
if (ret < 0)
{
err("Failed to register driver: %d\n", ret);
err("ERROR: Failed to register driver: %d\n", ret);
}
return ret;
drivers/power/battery_gauge.c
+2 -2
View File
@@ -213,7 +213,7 @@ static int bat_gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
break;
default:
err("Unrecognized cmd: %d\n", cmd);
err("ERROR: Unrecognized cmd: %d\n", cmd);
ret = -ENOTTY;
break;
}
@@ -253,7 +253,7 @@ int battery_gauge_register(FAR const char *devpath,
ret = register_driver(devpath, &g_batteryops, 0555, dev);
if (ret < 0)
{
err("Failed to register driver: %d\n", ret);
err("ERROR: Failed to register driver: %d\n", ret);
}
return ret;
drivers/power/bq2425x.c
+25 -22
View File
@@ -79,11 +79,14 @@
#ifdef CONFIG_DEBUG_BQ2425X
# define baterr err
# define batreg err
#else
# ifdef CONFIG_CPP_HAVE_VARARGS
# define baterr(x...)
# define batreg(x...)
# else
# define baterr (void)
# define batreg (void)
# endif
#endif
@@ -176,7 +179,7 @@ static int bq2425x_getreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
ret = i2c_write(priv->i2c, &config, &regaddr, 1);
if (ret < 0)
{
baterr("i2c_write failed: %d\n", ret);
baterr("ERROR: i2c_write failed: %d\n", ret);
return ret;
}
@@ -185,7 +188,7 @@ static int bq2425x_getreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
ret = i2c_read(priv->i2c, &config, &val, 1);
if (ret < 0)
{
baterr("i2c_read failed: %d\n", ret);
baterr("ERROR: i2c_read failed: %d\n", ret);
return ret;
}
@@ -217,7 +220,7 @@ static int bq2425x_putreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
config.address = priv->addr;
config.addrlen = 7;
baterr("addr: %02x regval: %08x\n", regaddr, regval);
batreg("addr: %02x regval: %08x\n", regaddr, regval);
/* Set up a 3 byte message to send */
@@ -270,7 +273,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
ret = bq2425x_getreg8(priv, BQ2425X_REG_2, &regval);
if (ret < 0)
{
baterr("Error reading from BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -280,7 +283,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
if (ret < 0)
{
baterr("Error writing to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -294,7 +297,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
if (ret < 0)
{
baterr("Error writing to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -317,7 +320,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
ret = bq2425x_getreg8(priv, BQ2425X_REG_1, &regval);
if (ret < 0)
{
baterr("Error reading from BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -333,7 +336,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
ret = bq2425x_putreg8(priv, BQ2425X_REG_1, regval);
if (ret < 0)
{
baterr("Error writing to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -515,7 +518,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
break;
default:
baterr("Current not supported, setting default to 100mA.!\n");
baterr("ERROR: Current not supported, setting default to 100mA.!\n");
idx = BQ2425X_INP_CURR_LIM_100MA;
break;
}
@@ -525,7 +528,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
ret = bq2425x_getreg8(priv, BQ2425X_REG_2, &regval);
if (ret < 0)
{
baterr("Error reading from BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -541,7 +544,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
if (ret < 0)
{
baterr("Error writing to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -565,14 +568,14 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
if (volts < BQ2425X_VOLT_MIN || volts > BQ2425X_VOLT_MAX)
{
baterr("Voltage %d mV is out of range.\n", volts);
baterr("ERROR: Voltage %d mV is out of range.\n", volts);
return -EINVAL;
}
ret = bq2425x_getreg8(priv, BQ2425X_REG_3, &regval);
if (ret < 0)
{
baterr("Error reading from BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -589,7 +592,7 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
ret = bq2425x_putreg8(priv, BQ2425X_REG_3, regval);
if (ret < 0)
{
baterr("Error writing to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -613,14 +616,14 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
if (current < BQ2425X_CURR_MIN || current > BQ2425X_CURR_MAX)
{
baterr("Current %d mA is out of range.\n", volts);
baterr("ERROR: Current %d mA is out of range.\n", volts);
return -EINVAL;
}
ret = bq2425x_getreg8(priv, BQ2425X_REG_4, &regval);
if (ret < 0)
{
baterr("Error reading from BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -637,7 +640,7 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
ret = bq2425x_putreg8(priv, BQ2425X_REG_4, regval);
if (ret < 0)
{
baterr("Error writing to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -663,7 +666,7 @@ static int bq2425x_voltage(struct battery_charger_dev_s *dev, int value)
ret = bq2425x_setvolt(priv, value);
if (ret < 0)
{
baterr("Error setting voltage to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error setting voltage to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -688,7 +691,7 @@ static int bq2425x_current(struct battery_charger_dev_s *dev, int value)
ret = bq2425x_setcurr(priv, value);
if (ret < 0)
{
baterr("Error setting current to BQ2425X! Error = %d\n", ret);
baterr("ERROR: Error setting current to BQ2425X! Error = %d\n", ret);
return ret;
}
@@ -749,7 +752,7 @@ FAR struct battery_charger_dev_s *
ret = bq2425x_reset(priv);
if (ret < 0)
{
baterr("Failed to reset the BQ2425x: %d\n", ret);
baterr("ERROR: Failed to reset the BQ2425x: %d\n", ret);
kmm_free(priv);
return NULL;
}
@@ -759,7 +762,7 @@ FAR struct battery_charger_dev_s *
ret = bq2425x_watchdog(priv, false);
if (ret < 0)
{
baterr("Failed to disable BQ2425x watchdog: %d\n", ret);
baterr("ERROR: Failed to disable BQ2425x watchdog: %d\n", ret);
kmm_free(priv);
return NULL;
}
@@ -769,7 +772,7 @@ FAR struct battery_charger_dev_s *
ret = bq2425x_powersupply(priv, 2000);
if (ret < 0)
{
baterr("Failed to set BQ2425x power supply current: %d\n", ret);
baterr("ERROR: Failed to set BQ2425x power supply current: %d\n", ret);
kmm_free(priv);
return NULL;
}