Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

drivers/: Change some nerr() ERRORS to ninfo() and nwarn() WARNINGS.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-12 09:26:12 -06:00
parent 61969a5f88
commit 0665c7e06c
34 changed files with 196 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/ads7843e.c
+11 -11
View File
@@ -427,7 +427,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv,
* the failure now.
*/
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
ret = -EINTR;
goto errout;
@@ -498,7 +498,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv)
ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
return OK;
@@ -870,7 +870,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
* handle smaller reads... but why?
*/
ierr("Unsupported read size: %d\n", len);
ierr("ERROR: Unsupported read size: %d\n", len);
return -ENOSYS;
}
@@ -881,7 +881,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
{
/* This should only happen if the wait was cancelled by an signal */
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
return -EINTR;
}
@@ -910,7 +910,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
{
/* We might have been awakened by a signal */
ierr("ads7843e_waitsample: %d\n", ret);
ierr("ERROR: ads7843e_waitsample: %d\n", ret);
goto errout;
}
}
@@ -1170,7 +1170,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
priv = (FAR struct ads7843e_dev_s *)kmm_malloc(sizeof(struct ads7843e_dev_s));
if (!priv)
{
ierr("kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
return -ENOMEM;
}
#endif
@@ -1197,12 +1197,12 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
ret = config->attach(config, ads7843e_interrupt);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
ierr("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
iinfo("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
/* Lock the SPI bus so that we have exclusive access */
@@ -1224,7 +1224,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
ret = register_driver(devname, &ads7843e_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1246,7 +1246,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
if (ret != 0)
{
ierr("Failed to queue work: %d\n", ret);
ierr("ERROR: Failed to queue work: %d\n", ret);
goto errout_with_priv;
}
drivers/input/max11802.c
+12 -12
View File
@@ -392,7 +392,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
* the failure now.
*/
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
ret = -EINTR;
goto errout;
@@ -463,7 +463,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv)
ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
return OK;
@@ -877,7 +877,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
* handle smaller reads... but why?
*/
ierr("Unsupported read size: %d\n", len);
ierr("ERROR: Unsupported read size: %d\n", len);
return -ENOSYS;
}
@@ -888,7 +888,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
{
/* This should only happen if the wait was cancelled by an signal */
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
return -EINTR;
}
@@ -917,7 +917,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
{
/* We might have been awakened by a signal */
ierr("max11802_waitsample: %d\n", ret);
ierr("ERROR: max11802_waitsample: %d\n", ret);
goto errout;
}
}
@@ -1173,7 +1173,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
priv = (FAR struct max11802_dev_s *)kmm_malloc(sizeof(struct max11802_dev_s));
if (!priv)
{
ierr("kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
return -ENOMEM;
}
#endif
@@ -1200,12 +1200,12 @@ int max11802_register(FAR struct spi_dev_s *spi,
ret = config->attach(config, max11802_interrupt);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
ierr("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
iinfo("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
/* Lock the SPI bus so that we have exclusive access */
@@ -1246,7 +1246,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
if (ret != MAX11802_MODE)
{
ierr("max11802 mode readback failed: %02x\n", ret);
ierr("ERROR: max11802 mode readback failed: %02x\n", ret);
goto errout_with_priv;
}
@@ -1258,7 +1258,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
ret = register_driver(devname, &max11802_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1281,7 +1281,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
if (ret != 0)
{
ierr("Failed to queue work: %d\n", ret);
ierr("ERROR: Failed to queue work: %d\n", ret);
goto errout_with_priv;
}
drivers/input/mxt.c
+7 -7
View File
@@ -343,7 +343,7 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
#ifdef CONFIG_I2C_RESET
/* Perhaps the I2C bus is locked up? Try to shake the bus free */
ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
iwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
ret = I2C_RESET(priv->i2c);
if (ret < 0)
@@ -417,7 +417,7 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
#ifdef CONFIG_I2C_RESET
/* Perhaps the I2C bus is locked up? Try to shake the bus free */
ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
iwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
ret = I2C_RESET(priv->i2c);
if (ret < 0)
@@ -1097,7 +1097,7 @@ static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void *arg)
ret = work_queue(HPWORK, &priv->work, mxt_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
/* Clear any pending interrupts and return success */
@@ -1575,7 +1575,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
if ((fds->events & POLLIN) == 0)
{
ierr("Missing POLLIN: revents: %08x\n", fds->revents);
ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
ret = -EDEADLK;
goto errout;
}
@@ -1600,7 +1600,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_MXT_NPOLLWAITERS)
{
ierr("No availabled slot found: %d\n", i);
ierr("ERROR: No availabled slot found: %d\n", i);
fds->priv = NULL;
ret = -EBUSY;
goto errout;
@@ -1897,7 +1897,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
ret = MXT_ATTACH(lower, mxt_interrupt, priv);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
@@ -1918,7 +1918,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
ret = register_driver(devname, &mxt_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_hwinit;
}
drivers/input/stmpe811_adc.c
+4 -4
View File
@@ -101,7 +101,7 @@ int stmpe811_adcinitialize(STMPE811_HANDLE handle)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -161,7 +161,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -169,7 +169,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
if ((priv->inuse & pinmask) != 0)
{
ierr("PIN%d is already in-use\n", pin);
ierr("ERROR: PIN%d is already in-use\n", pin);
sem_post(&priv->exclsem);
return -EBUSY;
}
@@ -221,7 +221,7 @@ uint16_t stmpe811_adcread(STMPE811_HANDLE handle, int pin)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
drivers/input/stmpe811_base.c
+4 -4
View File
@@ -199,7 +199,7 @@ static int stmpe811_interrupt(int irq, FAR void *context)
ret = work_queue(HPWORK, &priv->work, stmpe811_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
}
@@ -422,7 +422,7 @@ uint8_t stmpe811_getreg8(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
ret = I2C_TRANSFER(priv->i2c, msg, 2);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return 0;
}
@@ -479,7 +479,7 @@ void stmpe811_putreg8(FAR struct stmpe811_dev_s *priv,
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
}
}
#endif
@@ -530,7 +530,7 @@ uint16_t stmpe811_getreg16(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
ret = I2C_TRANSFER(priv->i2c, msg, 2);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return 0;
}
drivers/input/stmpe811_gpio.c
+6 -6
View File
@@ -144,7 +144,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -152,7 +152,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
if ((priv->inuse & pinmask) != 0)
{
ierr("PIN%d is already in-use\n", pin);
ierr("ERROR: PIN%d is already in-use\n", pin);
sem_post(&priv->exclsem);
return -EBUSY;
}
@@ -259,7 +259,7 @@ void stmpe811_gpiowrite(STMPE811_HANDLE handle, uint8_t pinconfig, bool value)
ret = sem_wait(&priv->exclsem);
if (ret < 0)
{
ierr("sem_wait failed: %d\n", errno);
ierr("ERROR: sem_wait failed: %d\n", errno);
return;
}
@@ -313,7 +313,7 @@ int stmpe811_gpioread(STMPE811_HANDLE handle, uint8_t pinconfig, bool *value)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -362,7 +362,7 @@ int stmpe811_gpioattach(STMPE811_HANDLE handle, uint8_t pinconfig,
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -438,7 +438,7 @@ void stmpe811_gpioworker(FAR struct stmpe811_dev_s *priv)
}
else
{
illerr("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
illerr("ERROR: No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
}
/* Clear the pending GPIO interrupt by writing a '1' to the
drivers/input/stmpe811_tsc.c
+1 -1
View File
@@ -786,7 +786,7 @@ static void stmpe811_timeout(int argc, uint32_t arg1, ...)
ret = work_queue(HPWORK, &priv->timeout, stmpe811_timeoutworker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
}
}
drivers/input/tsc2007.c
+13 -13
View File
@@ -456,7 +456,7 @@ static int tsc2007_activate(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
}
return ret;
}
@@ -495,7 +495,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return ret;
}
@@ -540,7 +540,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return ret;
}
@@ -672,7 +672,7 @@ static void tsc2007_worker(FAR void *arg)
if (z1 == 0)
{
ierr("Z1 zero\n");
ierr("ERROR: Z1 zero\n");
pressure = 0;
}
else
@@ -687,7 +687,7 @@ static void tsc2007_worker(FAR void *arg)
if (pressure > 0x0fff)
{
ierr("Dropped out-of-range pressure: %d\n", pressure);
ierr("ERROR: Dropped out-of-range pressure: %d\n", pressure);
pressure = 0;
}
}
@@ -783,7 +783,7 @@ static int tsc2007_interrupt(int irq, FAR void *context)
ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
/* Clear any pending interrupts and return success */
@@ -1131,7 +1131,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
if ((fds->events & POLLIN) == 0)
{
ierr("Missing POLLIN: revents: %08x\n", fds->revents);
ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
ret = -EDEADLK;
goto errout;
}
@@ -1156,7 +1156,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_TSC2007_NPOLLWAITERS)
{
ierr("No availabled slot found: %d\n", i);
ierr("ERROR: No available slot found: %d\n", i);
fds->priv = NULL;
ret = -EBUSY;
goto errout;
@@ -1242,7 +1242,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
priv = (FAR struct tsc2007_dev_s *)kmm_malloc(sizeof(struct tsc2007_dev_s));
if (!priv)
{
ierr("kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
return -ENOMEM;
}
#endif
@@ -1265,7 +1265,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = config->attach(config, tsc2007_interrupt);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
@@ -1276,7 +1276,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = tsc2007_transfer(priv, TSC2007_ENABLE_PENIRQ);
if (ret < 0)
{
ierr("tsc2007_transfer failed: %d\n", ret);
ierr("ERROR: tsc2007_transfer failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1288,7 +1288,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = register_driver(devname, &tsc2007_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1311,7 +1311,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
if (ret != 0)
{
ierr("Failed to queue work: %d\n", ret);
ierr("ERROR: Failed to queue work: %d\n", ret);
goto errout_with_priv;
}