Skip to content

L
linux
Commit 1c13ef4f authored by Vandana BN's avatar Vandana BN Committed by Greg Kroah-Hartman
Browse files
Options

Staging: kpc2000: kpc_dma: Resolve warning to use __func__ insted of funtion... 

Staging: kpc2000: kpc_dma: Resolve warning to use __func__ insted of funtion name reported by checkpatch.

This patch resolves warnings to use __func__ insted of funtion name.
WARNING: Prefer using '"%s...", __func__' to using 'setup_dma_engine', this function's name, in a string
Signed-off-by: default avatarVandana BN <bnvandana@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63c867d7
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
drivers/staging/kpc2000/kpc_dma/dma.c
View file @ 1c13ef4f
...@@ -96,7 +96,7 @@ int setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt) ...@@ -96,7 +96,7 @@ int setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt)
caps = GetEngineCapabilities(eng); caps = GetEngineCapabilities(eng);
if (WARN(!(caps & ENG_CAP_PRESENT), "setup_dma_engine() called for DMA Engine at %p which isn't present in hardware!\n", eng)) if (WARN(!(caps & ENG_CAP_PRESENT), "%s() called for DMA Engine at %p which isn't present in hardware!\n", __func__, eng))
return -ENXIO; return -ENXIO;
if (caps & ENG_CAP_DIRECTION) { if (caps & ENG_CAP_DIRECTION) {
...@@ -110,7 +110,7 @@ int setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt) ...@@ -110,7 +110,7 @@ int setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt)
eng->desc_pool_first = dma_pool_alloc(eng->desc_pool, GFP_KERNEL | GFP_DMA, &head_handle); eng->desc_pool_first = dma_pool_alloc(eng->desc_pool, GFP_KERNEL | GFP_DMA, &head_handle);
if (!eng->desc_pool_first) { if (!eng->desc_pool_first) {
dev_err(&eng->pldev->dev, "setup_dma_engine: couldn't allocate desc_pool_first!\n"); dev_err(&eng->pldev->dev, "%s: couldn't allocate desc_pool_first!\n", __func__);
dma_pool_destroy(eng->desc_pool); dma_pool_destroy(eng->desc_pool);
return -ENOMEM; return -ENOMEM;
} }
...@@ -146,7 +146,7 @@ int setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt) ...@@ -146,7 +146,7 @@ int setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt)
// Grab IRQ line // Grab IRQ line
rv = request_irq(eng->irq, ndd_irq_handler, IRQF_SHARED, KP_DRIVER_NAME_DMA_CONTROLLER, eng); rv = request_irq(eng->irq, ndd_irq_handler, IRQF_SHARED, KP_DRIVER_NAME_DMA_CONTROLLER, eng);
if (rv) { if (rv) {
dev_err(&eng->pldev->dev, "setup_dma_engine: failed to request_irq: %d\n", rv); dev_err(&eng->pldev->dev, "%s: failed to request_irq: %d\n", __func__, rv);
return rv; return rv;
} }
......
drivers/staging/kpc2000/kpc_dma/fileops.c
View file @ 1c13ef4f
...@@ -57,7 +57,7 @@ int kpc_dma_transfer(struct dev_private_data *priv, struct kiocb *kcb, unsigned ...@@ -57,7 +57,7 @@ int kpc_dma_transfer(struct dev_private_data *priv, struct kiocb *kcb, unsigned
ldev = priv->ldev; ldev = priv->ldev;
BUG_ON(ldev == NULL); BUG_ON(ldev == NULL);
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_transfer(priv = [%p], kcb = [%p], iov_base = [%p], iov_len = %ld) ldev = [%p]\n", priv, kcb, (void *)iov_base, iov_len, ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(priv = [%p], kcb = [%p], iov_base = [%p], iov_len = %ld) ldev = [%p]\n", __func__, priv, kcb, (void *)iov_base, iov_len, ldev);
acd = kzalloc(sizeof(*acd), GFP_KERNEL); acd = kzalloc(sizeof(*acd), GFP_KERNEL);
if (!acd) { if (!acd) {
...@@ -209,7 +209,7 @@ int kpc_dma_transfer(struct dev_private_data *priv, struct kiocb *kcb, unsigned ...@@ -209,7 +209,7 @@ int kpc_dma_transfer(struct dev_private_data *priv, struct kiocb *kcb, unsigned
kfree(acd->user_pages); kfree(acd->user_pages);
err_alloc_userpages: err_alloc_userpages:
kfree(acd); kfree(acd);
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_transfer returning with error %ld\n", rv); dev_dbg(&priv->ldev->pldev->dev, "%s returning with error %ld\n", __func__, rv);
return rv; return rv;
} }
...@@ -223,7 +223,7 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags) ...@@ -223,7 +223,7 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
BUG_ON(acd->ldev == NULL); BUG_ON(acd->ldev == NULL);
BUG_ON(acd->ldev->pldev == NULL); BUG_ON(acd->ldev->pldev == NULL);
dev_dbg(&acd->ldev->pldev->dev, "transfer_complete_cb(acd = [%p])\n", acd); dev_dbg(&acd->ldev->pldev->dev, "%s(acd = [%p])\n", __func__, acd);
for (i = 0 ; i < acd->page_count ; i++) { for (i = 0 ; i < acd->page_count ; i++) {
if (!PageReserved(acd->user_pages[i])) { if (!PageReserved(acd->user_pages[i])) {
...@@ -280,7 +280,7 @@ int kpc_dma_open(struct inode *inode, struct file *filp) ...@@ -280,7 +280,7 @@ int kpc_dma_open(struct inode *inode, struct file *filp)
priv->ldev = ldev; priv->ldev = ldev;
filp->private_data = priv; filp->private_data = priv;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_open(inode = [%p], filp = [%p]) priv = [%p] ldev = [%p]\n", inode, filp, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(inode = [%p], filp = [%p]) priv = [%p] ldev = [%p]\n", __func__, inode, filp, priv, priv->ldev);
return 0; return 0;
} }
...@@ -291,7 +291,7 @@ int kpc_dma_close(struct inode *inode, struct file *filp) ...@@ -291,7 +291,7 @@ int kpc_dma_close(struct inode *inode, struct file *filp)
struct dev_private_data *priv = (struct dev_private_data *)filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)filp->private_data;
struct kpc_dma_device *eng = priv->ldev; struct kpc_dma_device *eng = priv->ldev;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_close(inode = [%p], filp = [%p]) priv = [%p], ldev = [%p]\n", inode, filp, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(inode = [%p], filp = [%p]) priv = [%p], ldev = [%p]\n", __func__, inode, filp, priv, priv->ldev);
lock_engine(eng); lock_engine(eng);
...@@ -326,7 +326,7 @@ int kpc_dma_aio_cancel(struct kiocb *kcb) ...@@ -326,7 +326,7 @@ int kpc_dma_aio_cancel(struct kiocb *kcb)
{ {
struct dev_private_data *priv = (struct dev_private_data *)kcb->ki_filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)kcb->ki_filp->private_data;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_aio_cancel(kcb = [%p]) priv = [%p], ldev = [%p]\n", kcb, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(kcb = [%p]) priv = [%p], ldev = [%p]\n", __func__, kcb, priv, priv->ldev);
return 0; return 0;
} }
...@@ -335,13 +335,13 @@ ssize_t kpc_dma_aio_read(struct kiocb *kcb, const struct iovec *iov, unsigned ...@@ -335,13 +335,13 @@ ssize_t kpc_dma_aio_read(struct kiocb *kcb, const struct iovec *iov, unsigned
{ {
struct dev_private_data *priv = (struct dev_private_data *)kcb->ki_filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)kcb->ki_filp->private_data;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_aio_read(kcb = [%p], iov = [%p], iov_count = %ld, pos = %lld) priv = [%p], ldev = [%p]\n", kcb, iov, iov_count, pos, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(kcb = [%p], iov = [%p], iov_count = %ld, pos = %lld) priv = [%p], ldev = [%p]\n", __func__, kcb, iov, iov_count, pos, priv, priv->ldev);
if (priv->ldev->dir != DMA_FROM_DEVICE) if (priv->ldev->dir != DMA_FROM_DEVICE)
return -EMEDIUMTYPE; return -EMEDIUMTYPE;
if (iov_count != 1) { if (iov_count != 1) {
dev_err(&priv->ldev->pldev->dev, "kpc_dma_aio_read() called with iov_count > 1!\n"); dev_err(&priv->ldev->pldev->dev, "%s() called with iov_count > 1!\n", __func__);
return -EFAULT; return -EFAULT;
} }
...@@ -355,13 +355,13 @@ ssize_t kpc_dma_aio_write(struct kiocb *kcb, const struct iovec *iov, unsigned ...@@ -355,13 +355,13 @@ ssize_t kpc_dma_aio_write(struct kiocb *kcb, const struct iovec *iov, unsigned
{ {
struct dev_private_data *priv = (struct dev_private_data *)kcb->ki_filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)kcb->ki_filp->private_data;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_aio_write(kcb = [%p], iov = [%p], iov_count = %ld, pos = %lld) priv = [%p], ldev = [%p]\n", kcb, iov, iov_count, pos, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(kcb = [%p], iov = [%p], iov_count = %ld, pos = %lld) priv = [%p], ldev = [%p]\n", __func__, kcb, iov, iov_count, pos, priv, priv->ldev);
if (priv->ldev->dir != DMA_TO_DEVICE) if (priv->ldev->dir != DMA_TO_DEVICE)
return -EMEDIUMTYPE; return -EMEDIUMTYPE;
if (iov_count != 1) { if (iov_count != 1) {
dev_err(&priv->ldev->pldev->dev, "kpc_dma_aio_write() called with iov_count > 1!\n"); dev_err(&priv->ldev->pldev->dev, "%s() called with iov_count > 1!\n", __func__);
return -EFAULT; return -EFAULT;
} }
...@@ -376,7 +376,7 @@ ssize_t kpc_dma_read(struct file *filp, char __user *user_buf, size_t cou ...@@ -376,7 +376,7 @@ ssize_t kpc_dma_read(struct file *filp, char __user *user_buf, size_t cou
{ {
struct dev_private_data *priv = (struct dev_private_data *)filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)filp->private_data;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_read(filp = [%p], user_buf = [%p], count = %zu, ppos = [%p]) priv = [%p], ldev = [%p]\n", filp, user_buf, count, ppos, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(filp = [%p], user_buf = [%p], count = %zu, ppos = [%p]) priv = [%p], ldev = [%p]\n", __func__, filp, user_buf, count, ppos, priv, priv->ldev);
if (priv->ldev->dir != DMA_FROM_DEVICE) if (priv->ldev->dir != DMA_FROM_DEVICE)
return -EMEDIUMTYPE; return -EMEDIUMTYPE;
...@@ -389,7 +389,7 @@ ssize_t kpc_dma_write(struct file *filp, const char __user *user_buf, size_t co ...@@ -389,7 +389,7 @@ ssize_t kpc_dma_write(struct file *filp, const char __user *user_buf, size_t co
{ {
struct dev_private_data *priv = (struct dev_private_data *)filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)filp->private_data;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_write(filp = [%p], user_buf = [%p], count = %zu, ppos = [%p]) priv = [%p], ldev = [%p]\n", filp, user_buf, count, ppos, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(filp = [%p], user_buf = [%p], count = %zu, ppos = [%p]) priv = [%p], ldev = [%p]\n", __func__, filp, user_buf, count, ppos, priv, priv->ldev);
if (priv->ldev->dir != DMA_TO_DEVICE) if (priv->ldev->dir != DMA_TO_DEVICE)
return -EMEDIUMTYPE; return -EMEDIUMTYPE;
...@@ -402,7 +402,7 @@ long kpc_dma_ioctl(struct file *filp, unsigned int ioctl_num, unsigned long ioc ...@@ -402,7 +402,7 @@ long kpc_dma_ioctl(struct file *filp, unsigned int ioctl_num, unsigned long ioc
{ {
struct dev_private_data *priv = (struct dev_private_data *)filp->private_data; struct dev_private_data *priv = (struct dev_private_data *)filp->private_data;
dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_ioctl(filp = [%p], ioctl_num = 0x%x, ioctl_param = 0x%lx) priv = [%p], ldev = [%p]\n", filp, ioctl_num, ioctl_param, priv, priv->ldev); dev_dbg(&priv->ldev->pldev->dev, "%s(filp = [%p], ioctl_num = 0x%x, ioctl_param = 0x%lx) priv = [%p], ldev = [%p]\n", __func__, filp, ioctl_num, ioctl_param, priv, priv->ldev);
switch (ioctl_num) { switch (ioctl_num) {
case KND_IOCTL_SET_CARD_ADDR: case KND_IOCTL_SET_CARD_ADDR:
......
drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
View file @ 1c13ef4f
...@@ -101,12 +101,12 @@ int kpc_dma_probe(struct platform_device *pldev) ...@@ -101,12 +101,12 @@ int kpc_dma_probe(struct platform_device *pldev)
struct kpc_dma_device *ldev = kzalloc(sizeof(struct kpc_dma_device), GFP_KERNEL); struct kpc_dma_device *ldev = kzalloc(sizeof(struct kpc_dma_device), GFP_KERNEL);
if (!ldev) { if (!ldev) {
dev_err(&pldev->dev, "kpc_dma_probe: unable to kzalloc space for kpc_dma_device\n"); dev_err(&pldev->dev, "%s: unable to kzalloc space for kpc_dma_device\n", __func__);
rv = -ENOMEM; rv = -ENOMEM;
goto err_rv; goto err_rv;
} }
dev_dbg(&pldev->dev, "kpc_dma_probe(pldev = [%p]) ldev = [%p]\n", pldev, ldev); dev_dbg(&pldev->dev, "%s(pldev = [%p]) ldev = [%p]\n", __func__, pldev, ldev);
INIT_LIST_HEAD(&ldev->list); INIT_LIST_HEAD(&ldev->list);
...@@ -120,20 +120,20 @@ int kpc_dma_probe(struct platform_device *pldev) ...@@ -120,20 +120,20 @@ int kpc_dma_probe(struct platform_device *pldev)
// Get Engine regs resource // Get Engine regs resource
r = platform_get_resource(pldev, IORESOURCE_MEM, 0); r = platform_get_resource(pldev, IORESOURCE_MEM, 0);
if (!r) { if (!r) {
dev_err(&ldev->pldev->dev, "kpc_dma_probe: didn't get the engine regs resource!\n"); dev_err(&ldev->pldev->dev, "%s: didn't get the engine regs resource!\n", __func__);
rv = -ENXIO; rv = -ENXIO;
goto err_kfree; goto err_kfree;
} }
ldev->eng_regs = ioremap_nocache(r->start, resource_size(r)); ldev->eng_regs = ioremap_nocache(r->start, resource_size(r));
if (!ldev->eng_regs) { if (!ldev->eng_regs) {
dev_err(&ldev->pldev->dev, "kpc_dma_probe: failed to ioremap engine regs!\n"); dev_err(&ldev->pldev->dev, "%s: failed to ioremap engine regs!\n", __func__);
rv = -ENXIO; rv = -ENXIO;
goto err_kfree; goto err_kfree;
} }
r = platform_get_resource(pldev, IORESOURCE_IRQ, 0); r = platform_get_resource(pldev, IORESOURCE_IRQ, 0);
if (!r) { if (!r) {
dev_err(&ldev->pldev->dev, "kpc_dma_probe: didn't get the IRQ resource!\n"); dev_err(&ldev->pldev->dev, "%s: didn't get the IRQ resource!\n", __func__);
rv = -ENXIO; rv = -ENXIO;
goto err_kfree; goto err_kfree;
} }
...@@ -143,21 +143,21 @@ int kpc_dma_probe(struct platform_device *pldev) ...@@ -143,21 +143,21 @@ int kpc_dma_probe(struct platform_device *pldev)
dev = MKDEV(assigned_major_num, pldev->id); dev = MKDEV(assigned_major_num, pldev->id);
ldev->kpc_dma_dev = device_create(kpc_dma_class, &pldev->dev, dev, ldev, "kpc_dma%d", pldev->id); ldev->kpc_dma_dev = device_create(kpc_dma_class, &pldev->dev, dev, ldev, "kpc_dma%d", pldev->id);
if (IS_ERR(ldev->kpc_dma_dev)) { if (IS_ERR(ldev->kpc_dma_dev)) {
dev_err(&ldev->pldev->dev, "kpc_dma_probe: device_create failed: %d\n", rv); dev_err(&ldev->pldev->dev, "%s: device_create failed: %d\n", __func__, rv);
goto err_kfree; goto err_kfree;
} }
// Setup the DMA engine // Setup the DMA engine
rv = setup_dma_engine(ldev, 30); rv = setup_dma_engine(ldev, 30);
if (rv) { if (rv) {
dev_err(&ldev->pldev->dev, "kpc_dma_probe: failed to setup_dma_engine: %d\n", rv); dev_err(&ldev->pldev->dev, "%s: failed to setup_dma_engine: %d\n", __func__, rv);
goto err_misc_dereg; goto err_misc_dereg;
} }
// Setup the sysfs files // Setup the sysfs files
rv = sysfs_create_files(&(ldev->pldev->dev.kobj), ndd_attr_list); rv = sysfs_create_files(&(ldev->pldev->dev.kobj), ndd_attr_list);
if (rv) { if (rv) {
dev_err(&ldev->pldev->dev, "kpc_dma_probe: Failed to add sysfs files: %d\n", rv); dev_err(&ldev->pldev->dev, "%s: Failed to add sysfs files: %d\n", __func__, rv);
goto err_destroy_eng; goto err_destroy_eng;
} }
...@@ -183,7 +183,7 @@ int kpc_dma_remove(struct platform_device *pldev) ...@@ -183,7 +183,7 @@ int kpc_dma_remove(struct platform_device *pldev)
if (!ldev) if (!ldev)
return -ENXIO; return -ENXIO;
dev_dbg(&ldev->pldev->dev, "kpc_dma_remove(pldev = [%p]) ldev = [%p]\n", pldev, ldev); dev_dbg(&ldev->pldev->dev, "%s(pldev = [%p]) ldev = [%p]\n", __func__, pldev, ldev);
lock_engine(ldev); lock_engine(ldev);
sysfs_remove_files(&(ldev->pldev->dev.kobj), ndd_attr_list); sysfs_remove_files(&(ldev->pldev->dev.kobj), ndd_attr_list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7