mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 16:50:55 +08:00
Without lowsyslog() *llinfo() is not useful. Eliminate and replace with *info().
This commit is contained in:
+13
-13
@@ -414,7 +414,7 @@ static int ajoy_open(FAR struct file *filep)
|
||||
ret = ajoy_takesem(&priv->au_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -423,7 +423,7 @@ static int ajoy_open(FAR struct file *filep)
|
||||
opriv = (FAR struct ajoy_open_s *)kmm_zalloc(sizeof(struct ajoy_open_s));
|
||||
if (!opriv)
|
||||
{
|
||||
iinfo("ERROR: Failled to allocate open structure\n");
|
||||
ierr("ERROR: Failled to allocate open structure\n");
|
||||
ret = -ENOMEM;
|
||||
goto errout_with_sem;
|
||||
}
|
||||
@@ -502,7 +502,7 @@ static int ajoy_close(FAR struct file *filep)
|
||||
ret = ajoy_takesem(&priv->au_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -515,7 +515,7 @@ static int ajoy_close(FAR struct file *filep)
|
||||
DEBUGASSERT(curr);
|
||||
if (!curr)
|
||||
{
|
||||
iinfo("ERROR: Failed to find open entry\n");
|
||||
ierr("ERROR: Failed to find open entry\n");
|
||||
ret = -ENOENT;
|
||||
goto errout_with_exclsem;
|
||||
}
|
||||
@@ -570,7 +570,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
|
||||
|
||||
if (len < sizeof(struct ajoy_sample_s))
|
||||
{
|
||||
iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
|
||||
ierr("ERROR: buffer too small: %lu\n", (unsigned long)len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -579,7 +579,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
|
||||
ret = ajoy_takesem(&priv->au_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -620,7 +620,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
ret = ajoy_takesem(&priv->au_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -720,7 +720,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
#endif
|
||||
|
||||
default:
|
||||
iinfo("ERROR: Unrecognized command: %ld\n", cmd);
|
||||
ierr("ERROR: Unrecognized command: %ld\n", cmd);
|
||||
ret = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
@@ -754,7 +754,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
ret = ajoy_takesem(&priv->au_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: ajoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -782,7 +782,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
|
||||
if (i >= CONFIG_AJOYSTICK_NPOLLWAITERS)
|
||||
{
|
||||
iinfo("ERROR: Too man poll waiters\n");
|
||||
ierr("ERROR: Too man poll waiters\n");
|
||||
fds->priv = NULL;
|
||||
ret = -EBUSY;
|
||||
goto errout_with_dusem;
|
||||
@@ -797,7 +797,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
#ifdef CONFIG_DEBUG_FEATURES
|
||||
if (!slot)
|
||||
{
|
||||
iinfo("ERROR: Poll slot not found\n");
|
||||
ierr("ERROR: Poll slot not found\n");
|
||||
ret = -EIO;
|
||||
goto errout_with_dusem;
|
||||
}
|
||||
@@ -856,7 +856,7 @@ int ajoy_register(FAR const char *devname,
|
||||
|
||||
if (!priv)
|
||||
{
|
||||
iinfo("ERROR: Failed to allocate device structure\n");
|
||||
ierr("ERROR: Failed to allocate device structure\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@@ -878,7 +878,7 @@ int ajoy_register(FAR const char *devname,
|
||||
ret = register_driver(devname, &ajoy_fops, 0666, priv);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: register_driver failed: %d\n", ret);
|
||||
ierr("ERROR: register_driver failed: %d\n", ret);
|
||||
goto errout_with_priv;
|
||||
}
|
||||
|
||||
|
||||
@@ -138,8 +138,8 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower,
|
||||
flags = enter_critical_section();
|
||||
btn_disable();
|
||||
|
||||
illinfo("press: %02x release: %02x handler: %p arg: %p\n",
|
||||
press, release, handler, arg);
|
||||
iinfo("press: %02x release: %02x handler: %p arg: %p\n",
|
||||
press, release, handler, arg);
|
||||
|
||||
/* If no events are indicated or if no handler is provided, then this
|
||||
* must really be a request to disable interrupts.
|
||||
|
||||
@@ -410,7 +410,7 @@ static int btn_open(FAR struct file *filep)
|
||||
ret = btn_takesem(&priv->bu_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: btn_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: btn_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -419,7 +419,7 @@ static int btn_open(FAR struct file *filep)
|
||||
opriv = (FAR struct btn_open_s *)kmm_zalloc(sizeof(struct btn_open_s));
|
||||
if (!opriv)
|
||||
{
|
||||
iinfo("ERROR: Failled to allocate open structure\n");
|
||||
ierr("ERROR: Failled to allocate open structure\n");
|
||||
ret = -ENOMEM;
|
||||
goto errout_with_sem;
|
||||
}
|
||||
@@ -498,7 +498,7 @@ static int btn_close(FAR struct file *filep)
|
||||
ret = btn_takesem(&priv->bu_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: btn_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: btn_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -511,7 +511,7 @@ static int btn_close(FAR struct file *filep)
|
||||
DEBUGASSERT(curr);
|
||||
if (!curr)
|
||||
{
|
||||
iinfo("ERROR: Failed to find open entry\n");
|
||||
ierr("ERROR: Failed to find open entry\n");
|
||||
ret = -ENOENT;
|
||||
goto errout_with_exclsem;
|
||||
}
|
||||
@@ -566,7 +566,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
|
||||
|
||||
if (len < sizeof(btn_buttonset_t))
|
||||
{
|
||||
iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
|
||||
ierr("ERROR: buffer too small: %lu\n", (unsigned long)len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -575,7 +575,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
|
||||
ret = btn_takesem(&priv->bu_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: btn_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: btn_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -612,7 +612,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
ret = btn_takesem(&priv->bu_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: btn_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: btn_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -712,7 +712,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
#endif
|
||||
|
||||
default:
|
||||
iinfo("ERROR: Unrecognized command: %ld\n", cmd);
|
||||
ierr("ERROR: Unrecognized command: %ld\n", cmd);
|
||||
ret = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
@@ -746,7 +746,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
ret = btn_takesem(&priv->bu_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: btn_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: btn_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -774,7 +774,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
|
||||
if (i >= CONFIG_BUTTONS_NPOLLWAITERS)
|
||||
{
|
||||
iinfo("ERROR: Too man poll waiters\n");
|
||||
ierr("ERROR: Too man poll waiters\n");
|
||||
fds->priv = NULL;
|
||||
ret = -EBUSY;
|
||||
goto errout_with_dusem;
|
||||
@@ -789,7 +789,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
#ifdef CONFIG_DEBUG_FEATURES
|
||||
if (!slot)
|
||||
{
|
||||
iinfo("ERROR: Poll slot not found\n");
|
||||
ierr("ERROR: Poll slot not found\n");
|
||||
ret = -EIO;
|
||||
goto errout_with_dusem;
|
||||
}
|
||||
@@ -847,7 +847,7 @@ int btn_register(FAR const char *devname,
|
||||
|
||||
if (!priv)
|
||||
{
|
||||
iinfo("ERROR: Failed to allocate device structure\n");
|
||||
ierr("ERROR: Failed to allocate device structure\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@@ -869,7 +869,7 @@ int btn_register(FAR const char *devname,
|
||||
ret = register_driver(devname, &btn_fops, 0666, priv);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: register_driver failed: %d\n", ret);
|
||||
ierr("ERROR: register_driver failed: %d\n", ret);
|
||||
goto errout_with_priv;
|
||||
}
|
||||
|
||||
|
||||
+14
-14
@@ -352,7 +352,7 @@ static void djoy_sample(FAR struct djoy_upperhalf_s *priv)
|
||||
fds->revents |= (fds->events & POLLIN);
|
||||
if (fds->revents != 0)
|
||||
{
|
||||
illinfo("Report events: %02x\n", fds->revents);
|
||||
iinfo("Report events: %02x\n", fds->revents);
|
||||
sem_post(fds->sem);
|
||||
}
|
||||
}
|
||||
@@ -414,7 +414,7 @@ static int djoy_open(FAR struct file *filep)
|
||||
ret = djoy_takesem(&priv->du_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -423,7 +423,7 @@ static int djoy_open(FAR struct file *filep)
|
||||
opriv = (FAR struct djoy_open_s *)kmm_zalloc(sizeof(struct djoy_open_s));
|
||||
if (!opriv)
|
||||
{
|
||||
iinfo("ERROR: Failled to allocate open structure\n");
|
||||
ierr("ERROR: Failled to allocate open structure\n");
|
||||
ret = -ENOMEM;
|
||||
goto errout_with_sem;
|
||||
}
|
||||
@@ -502,7 +502,7 @@ static int djoy_close(FAR struct file *filep)
|
||||
ret = djoy_takesem(&priv->du_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -515,7 +515,7 @@ static int djoy_close(FAR struct file *filep)
|
||||
DEBUGASSERT(curr);
|
||||
if (!curr)
|
||||
{
|
||||
iinfo("ERROR: Failed to find open entry\n");
|
||||
ierr("ERROR: Failed to find open entry\n");
|
||||
ret = -ENOENT;
|
||||
goto errout_with_exclsem;
|
||||
}
|
||||
@@ -568,7 +568,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
|
||||
|
||||
if (len < sizeof(djoy_buttonset_t))
|
||||
{
|
||||
iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
|
||||
ierr("ERROR: buffer too small: %lu\n", (unsigned long)len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -577,7 +577,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
|
||||
ret = djoy_takesem(&priv->du_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -616,7 +616,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
ret = djoy_takesem(&priv->du_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -716,7 +716,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
#endif
|
||||
|
||||
default:
|
||||
iinfo("ERROR: Unrecognized command: %ld\n", cmd);
|
||||
ierr("ERROR: Unrecognized command: %ld\n", cmd);
|
||||
ret = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
@@ -750,7 +750,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
ret = djoy_takesem(&priv->du_exclsem);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
ierr("ERROR: djoy_takesem failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -778,7 +778,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
|
||||
if (i >= CONFIG_DJOYSTICK_NPOLLWAITERS)
|
||||
{
|
||||
iinfo("ERROR: Too man poll waiters\n");
|
||||
ierr("ERROR: Too man poll waiters\n");
|
||||
fds->priv = NULL;
|
||||
ret = -EBUSY;
|
||||
goto errout_with_dusem;
|
||||
@@ -793,7 +793,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||
#ifdef CONFIG_DEBUG_FEATURES
|
||||
if (!slot)
|
||||
{
|
||||
iinfo("ERROR: Poll slot not found\n");
|
||||
ierr("ERROR: Poll slot not found\n");
|
||||
ret = -EIO;
|
||||
goto errout_with_dusem;
|
||||
}
|
||||
@@ -852,7 +852,7 @@ int djoy_register(FAR const char *devname,
|
||||
|
||||
if (!priv)
|
||||
{
|
||||
iinfo("ERROR: Failed to allocate device structure\n");
|
||||
ierr("ERROR: Failed to allocate device structure\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@@ -874,7 +874,7 @@ int djoy_register(FAR const char *devname,
|
||||
ret = register_driver(devname, &djoy_fops, 0666, priv);
|
||||
if (ret < 0)
|
||||
{
|
||||
iinfo("ERROR: register_driver failed: %d\n", ret);
|
||||
ierr("ERROR: register_driver failed: %d\n", ret);
|
||||
sem_destroy(&priv->du_exclsem);
|
||||
kmm_free(priv);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user