From nobody Fri Dec 19 04:34:20 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78425CDB483 for ; Thu, 19 Oct 2023 07:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344838AbjJSHUb (ORCPT ); Thu, 19 Oct 2023 03:20:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232854AbjJSHU1 (ORCPT ); Thu, 19 Oct 2023 03:20:27 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF605123 for ; Thu, 19 Oct 2023 00:20:23 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1ca052ec63bso52441005ad.1 for ; Thu, 19 Oct 2023 00:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697700023; x=1698304823; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rAQbNfa8BHxfgReN6qdaYul2aXhYc+/aEm7bq8OvEsI=; b=jvYJ17ulhn+kYZDjMFd2GBCiNSnlVUttF6+ZzuTZ1LEp+pMX8YxjXPQfOmbfiOgYzd O4uwHA7H+2F+CcpVAzwWTDD44TClQnuQQTnPaD05ckX0QjRlxOvLY15G/moIKIlB31NF TDuQuxDQzNe4JoXZfsMM11qZKNVlKs7YVfn4JBbsiPw+Sx0+nirl3WCTW60KQW3u4A5S sfNUYebD3EXhlpkx00vL+O5t75HI5D99sifdMHn8mhI9Isk3qVvJ9D7kRcTAqHDRboks rgwv27MocbKTvIZi57HUJb2Ca0T0tCsH8hW/V8fQdrRjP8iDW1Okx+Usk5y9O4p54XmO qP9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697700023; x=1698304823; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rAQbNfa8BHxfgReN6qdaYul2aXhYc+/aEm7bq8OvEsI=; b=eDhAsgFztmNyQdenM5q52zEHAyn/9iewOkjsTEbGz0iqePtwUjcoybHsIpqUPhf5Ho 7GXK7r9MRtBnXyqing1zRjCoWKmD5Tx3tVAqAoyIcPnfSzx1oZ3uJEopxeNoes9QDkaQ 2mHgrs+aWMNUuuMK2lf3uGv3cxkBcAlmojXSfBZC7htzw2rci2qPkAWDc2G1YRu9Rcuu +fw2wJg4Kn5J63RDG6EpP4RQFu5QT6iVamdhQIACHpgvUyH/s0egLppZWwfEPovmnV27 +w6st7EACSfBcq+byDq9GQPLV5KUJ/l9PQxn9Kl+vfuzfMNZeJzHyJ5EoVGGTjzfoIzF 2qKA== X-Gm-Message-State: AOJu0YxNlAEeoQs3nf4cTA0OAKeEbn3X5STs3CX8P5NbPpgh+u283/NU C/IUnmcyJi+JggoCJsx7aPQ= X-Google-Smtp-Source: AGHT+IG8GN7ND3R1T531oyYt5AVEAPBiYBJ+0aSBVsBlnhQfHEDcI2PbOTsqIOpyKzFdsz+9cDucbw== X-Received: by 2002:a17:902:d4c9:b0:1b9:de75:d5bb with SMTP id o9-20020a170902d4c900b001b9de75d5bbmr1943676plg.7.1697700023121; Thu, 19 Oct 2023 00:20:23 -0700 (PDT) Received: from Negi ([68.181.16.134]) by smtp.gmail.com with ESMTPSA id b3-20020a170902d50300b001b8622c1ad2sm1144013plg.130.2023.10.19.00.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:20:22 -0700 (PDT) From: Soumya Negi To: Martyn Welch , Manohar Vanga , Greg Kroah-Hartman , Andi Shyti , Julia Lawall Cc: outreachy@lists.linux.dev, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Soumya Negi Subject: [PATCH v2 1/2] staging: vme_user: Replace printk() with pr_*(),dev_*() Date: Thu, 19 Oct 2023 00:20:09 -0700 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" vme.c uses printk() to log messages. To improve and standardize message formatting, use logging mechanisms pr_err()/pr_warn() and dev_err()/dev_warn() instead. Retain the printk log levels of the messages during replacement. Issue found by checkpatch.pl Signed-off-by: Soumya Negi Acked-by: Andi Shyti =20 --- Changes in v2: * Change the pr_*() calls used to replace printk's in v1 to dev_*()=20 wherever possible, as it adds more context to the message. (as per feedback from julia.lawall@inria.fr &=20 gregkh@linuxfoundation.org) drivers/staging/vme_user/vme.c | 193 +++++++++++++++++++-------------- 1 file changed, 109 insertions(+), 84 deletions(-) diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c index 6519a7c994a0..640b2dda3ac6 100644 --- a/drivers/staging/vme_user/vme.c +++ b/drivers/staging/vme_user/vme.c @@ -9,6 +9,8 @@ * Copyright 2004 Motorola Inc. */ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -62,7 +64,7 @@ static struct vme_bridge *find_bridge(struct vme_resource= *resource) return list_entry(resource->entry, struct vme_lm_resource, list)->parent; default: - printk(KERN_ERR "Unknown resource type\n"); + pr_err("Unknown resource type\n"); return NULL; } } @@ -84,24 +86,25 @@ void *vme_alloc_consistent(struct vme_resource *resourc= e, size_t size, struct vme_bridge *bridge; =20 if (!resource) { - printk(KERN_ERR "No resource\n"); + pr_err("No resource\n"); return NULL; } =20 bridge =3D find_bridge(resource); if (!bridge) { - printk(KERN_ERR "Can't find bridge\n"); + pr_err("Can't find bridge\n"); return NULL; } =20 if (!bridge->parent) { - printk(KERN_ERR "Dev entry NULL for bridge %s\n", bridge->name); + pr_err("Dev entry NULL for bridge %s\n", bridge->name); return NULL; } =20 if (!bridge->alloc_consistent) { - printk(KERN_ERR "alloc_consistent not supported by bridge %s\n", - bridge->name); + dev_err(bridge->parent, + "alloc_consistent not supported by bridge %s\n", + bridge->name); return NULL; } =20 @@ -124,24 +127,25 @@ void vme_free_consistent(struct vme_resource *resourc= e, size_t size, struct vme_bridge *bridge; =20 if (!resource) { - printk(KERN_ERR "No resource\n"); + pr_err("No resource\n"); return; } =20 bridge =3D find_bridge(resource); if (!bridge) { - printk(KERN_ERR "Can't find bridge\n"); + pr_err("Can't find bridge\n"); return; } =20 if (!bridge->parent) { - printk(KERN_ERR "Dev entry NULL for bridge %s\n", bridge->name); + pr_err("Dev entry NULL for bridge %s\n", bridge->name); return; } =20 if (!bridge->free_consistent) { - printk(KERN_ERR "free_consistent not supported by bridge %s\n", - bridge->name); + dev_err(bridge->parent, + "free_consistent not supported by bridge %s\n", + bridge->name); return; } =20 @@ -161,6 +165,7 @@ EXPORT_SYMBOL(vme_free_consistent); */ size_t vme_get_size(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); int enabled, retval; unsigned long long base, size; dma_addr_t buf_base; @@ -184,7 +189,7 @@ size_t vme_get_size(struct vme_resource *resource) case VME_DMA: return 0; default: - printk(KERN_ERR "Unknown resource type\n"); + dev_err(bridge->parent, "Unknown resource type\n"); return 0; } } @@ -225,7 +230,7 @@ int vme_check_window(u32 aspace, unsigned long long vme= _base, /* User Defined */ break; default: - printk(KERN_ERR "Invalid address space\n"); + pr_err("Invalid address space\n"); retval =3D -EINVAL; break; } @@ -288,14 +293,15 @@ struct vme_resource *vme_slave_request(struct vme_dev= *vdev, u32 address, =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); goto err_bus; } =20 /* Loop through slave resources */ list_for_each_entry(slave_image, &bridge->slave_resources, list) { if (!slave_image) { - printk(KERN_ERR "Registered NULL Slave resource\n"); + dev_err(bridge->parent, + "Registered NULL Slave resource\n"); continue; } =20 @@ -362,20 +368,20 @@ int vme_slave_set(struct vme_resource *resource, int = enabled, int retval; =20 if (resource->type !=3D VME_SLAVE) { - printk(KERN_ERR "Not a slave resource\n"); + dev_err(bridge->parent, "Not a slave resource\n"); return -EINVAL; } =20 image =3D list_entry(resource->entry, struct vme_slave_resource, list); =20 if (!bridge->slave_set) { - printk(KERN_ERR "Function not supported\n"); + dev_err(bridge->parent, "Function not supported\n"); return -ENOSYS; } =20 if (!(((image->address_attr & aspace) =3D=3D aspace) && ((image->cycle_attr & cycle) =3D=3D cycle))) { - printk(KERN_ERR "Invalid attributes\n"); + dev_err(bridge->parent, "Invalid attributes\n"); return -EINVAL; } =20 @@ -411,14 +417,14 @@ int vme_slave_get(struct vme_resource *resource, int = *enabled, struct vme_slave_resource *image; =20 if (resource->type !=3D VME_SLAVE) { - printk(KERN_ERR "Not a slave resource\n"); + dev_err(bridge->parent, "Not a slave resource\n"); return -EINVAL; } =20 image =3D list_entry(resource->entry, struct vme_slave_resource, list); =20 if (!bridge->slave_get) { - printk(KERN_ERR "vme_slave_get not supported\n"); + dev_err(bridge->parent, "vme_slave_get not supported\n"); return -EINVAL; } =20 @@ -435,24 +441,25 @@ EXPORT_SYMBOL(vme_slave_get); */ void vme_slave_free(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_slave_resource *slave_image; =20 if (resource->type !=3D VME_SLAVE) { - printk(KERN_ERR "Not a slave resource\n"); + dev_err(bridge->parent, "Not a slave resource\n"); return; } =20 slave_image =3D list_entry(resource->entry, struct vme_slave_resource, list); if (!slave_image) { - printk(KERN_ERR "Can't find slave resource\n"); + dev_err(bridge->parent, "Can't find slave resource\n"); return; } =20 /* Unlock image */ mutex_lock(&slave_image->mtx); if (slave_image->locked =3D=3D 0) - printk(KERN_ERR "Image is already free\n"); + dev_err(bridge->parent, "Image is already free\n"); =20 slave_image->locked =3D 0; mutex_unlock(&slave_image->mtx); @@ -484,14 +491,15 @@ struct vme_resource *vme_master_request(struct vme_de= v *vdev, u32 address, =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); goto err_bus; } =20 /* Loop through master resources */ list_for_each_entry(master_image, &bridge->master_resources, list) { if (!master_image) { - printk(KERN_WARNING "Registered NULL master resource\n"); + dev_warn(bridge->parent, + "Registered NULL master resource\n"); continue; } =20 @@ -511,7 +519,7 @@ struct vme_resource *vme_master_request(struct vme_dev = *vdev, u32 address, =20 /* Check to see if we found a resource */ if (!allocated_image) { - printk(KERN_ERR "Can't find a suitable resource\n"); + dev_err(&vdev->dev, "Can't find a suitable resource\n"); goto err_image; } =20 @@ -561,21 +569,21 @@ int vme_master_set(struct vme_resource *resource, int= enabled, int retval; =20 if (resource->type !=3D VME_MASTER) { - printk(KERN_ERR "Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return -EINVAL; } =20 image =3D list_entry(resource->entry, struct vme_master_resource, list); =20 if (!bridge->master_set) { - printk(KERN_WARNING "vme_master_set not supported\n"); + dev_warn(bridge->parent, "vme_master_set not supported\n"); return -EINVAL; } =20 if (!(((image->address_attr & aspace) =3D=3D aspace) && ((image->cycle_attr & cycle) =3D=3D cycle) && ((image->width_attr & dwidth) =3D=3D dwidth))) { - printk(KERN_WARNING "Invalid attributes\n"); + dev_warn(bridge->parent, "Invalid attributes\n"); return -EINVAL; } =20 @@ -611,14 +619,14 @@ int vme_master_get(struct vme_resource *resource, int= *enabled, struct vme_master_resource *image; =20 if (resource->type !=3D VME_MASTER) { - printk(KERN_ERR "Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return -EINVAL; } =20 image =3D list_entry(resource->entry, struct vme_master_resource, list); =20 if (!bridge->master_get) { - printk(KERN_WARNING "%s not supported\n", __func__); + dev_warn(bridge->parent, "%s not supported\n", __func__); return -EINVAL; } =20 @@ -650,12 +658,13 @@ ssize_t vme_master_read(struct vme_resource *resource= , void *buf, size_t count, size_t length; =20 if (!bridge->master_read) { - printk(KERN_WARNING "Reading from resource not supported\n"); + dev_warn(bridge->parent, + "Reading from resource not supported\n"); return -EINVAL; } =20 if (resource->type !=3D VME_MASTER) { - printk(KERN_ERR "Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return -EINVAL; } =20 @@ -664,7 +673,7 @@ ssize_t vme_master_read(struct vme_resource *resource, = void *buf, size_t count, length =3D vme_get_size(resource); =20 if (offset > length) { - printk(KERN_WARNING "Invalid Offset\n"); + dev_warn(bridge->parent, "Invalid Offset\n"); return -EFAULT; } =20 @@ -698,12 +707,12 @@ ssize_t vme_master_write(struct vme_resource *resourc= e, void *buf, size_t length; =20 if (!bridge->master_write) { - printk(KERN_WARNING "Writing to resource not supported\n"); + dev_warn(bridge->parent, "Writing to resource not supported\n"); return -EINVAL; } =20 if (resource->type !=3D VME_MASTER) { - printk(KERN_ERR "Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return -EINVAL; } =20 @@ -712,7 +721,7 @@ ssize_t vme_master_write(struct vme_resource *resource,= void *buf, length =3D vme_get_size(resource); =20 if (offset > length) { - printk(KERN_WARNING "Invalid Offset\n"); + dev_warn(bridge->parent, "Invalid Offset\n"); return -EFAULT; } =20 @@ -749,12 +758,12 @@ unsigned int vme_master_rmw(struct vme_resource *reso= urce, unsigned int mask, struct vme_master_resource *image; =20 if (!bridge->master_rmw) { - printk(KERN_WARNING "Writing to resource not supported\n"); + dev_warn(bridge->parent, "Writing to resource not supported\n"); return -EINVAL; } =20 if (resource->type !=3D VME_MASTER) { - printk(KERN_ERR "Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return -EINVAL; } =20 @@ -777,12 +786,13 @@ EXPORT_SYMBOL(vme_master_rmw); */ int vme_master_mmap(struct vme_resource *resource, struct vm_area_struct *= vma) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_master_resource *image; phys_addr_t phys_addr; unsigned long vma_size; =20 if (resource->type !=3D VME_MASTER) { - pr_err("Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return -EINVAL; } =20 @@ -791,7 +801,7 @@ int vme_master_mmap(struct vme_resource *resource, stru= ct vm_area_struct *vma) vma_size =3D vma->vm_end - vma->vm_start; =20 if (phys_addr + vma_size > image->bus_resource.end + 1) { - pr_err("Map size cannot exceed the window size\n"); + dev_err(bridge->parent, "Map size cannot exceed the window size\n"); return -EFAULT; } =20 @@ -809,24 +819,25 @@ EXPORT_SYMBOL(vme_master_mmap); */ void vme_master_free(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_master_resource *master_image; =20 if (resource->type !=3D VME_MASTER) { - printk(KERN_ERR "Not a master resource\n"); + dev_err(bridge->parent, "Not a master resource\n"); return; } =20 master_image =3D list_entry(resource->entry, struct vme_master_resource, list); if (!master_image) { - printk(KERN_ERR "Can't find master resource\n"); + dev_err(bridge->parent, "Can't find master resource\n"); return; } =20 /* Unlock image */ spin_lock(&master_image->lock); if (master_image->locked =3D=3D 0) - printk(KERN_ERR "Image is already free\n"); + dev_err(bridge->parent, "Image is already free\n"); =20 master_image->locked =3D 0; spin_unlock(&master_image->lock); @@ -854,18 +865,19 @@ struct vme_resource *vme_dma_request(struct vme_dev *= vdev, u32 route) struct vme_resource *resource =3D NULL; =20 /* XXX Not checking resource attributes */ - printk(KERN_ERR "No VME resource Attribute tests done\n"); + dev_err(&vdev->dev, "No VME resource Attribute tests done\n"); =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); goto err_bus; } =20 /* Loop through DMA resources */ list_for_each_entry(dma_ctrlr, &bridge->dma_resources, list) { if (!dma_ctrlr) { - printk(KERN_ERR "Registered NULL DMA resource\n"); + dev_err(bridge->parent, + "Registered NULL DMA resource\n"); continue; } =20 @@ -917,10 +929,11 @@ EXPORT_SYMBOL(vme_dma_request); */ struct vme_dma_list *vme_new_dma_list(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_dma_list *dma_list; =20 if (resource->type !=3D VME_DMA) { - printk(KERN_ERR "Not a DMA resource\n"); + dev_err(bridge->parent, "Not a DMA resource\n"); return NULL; } =20 @@ -1098,12 +1111,13 @@ int vme_dma_list_add(struct vme_dma_list *list, str= uct vme_dma_attr *src, int retval; =20 if (!bridge->dma_list_add) { - printk(KERN_WARNING "Link List DMA generation not supported\n"); + dev_warn(bridge->parent, + "Link List DMA generation not supported\n"); return -EINVAL; } =20 if (!mutex_trylock(&list->mtx)) { - printk(KERN_ERR "Link List already submitted\n"); + dev_err(bridge->parent, "Link List already submitted\n"); return -EINVAL; } =20 @@ -1131,7 +1145,8 @@ int vme_dma_list_exec(struct vme_dma_list *list) int retval; =20 if (!bridge->dma_list_exec) { - printk(KERN_ERR "Link List DMA execution not supported\n"); + dev_err(bridge->parent, + "Link List DMA execution not supported\n"); return -EINVAL; } =20 @@ -1160,12 +1175,13 @@ int vme_dma_list_free(struct vme_dma_list *list) int retval; =20 if (!bridge->dma_list_empty) { - printk(KERN_WARNING "Emptying of Link Lists not supported\n"); + dev_warn(bridge->parent, + "Emptying of Link Lists not supported\n"); return -EINVAL; } =20 if (!mutex_trylock(&list->mtx)) { - printk(KERN_ERR "Link List in use\n"); + dev_err(bridge->parent, "Link List in use\n"); return -EBUSY; } =20 @@ -1175,7 +1191,7 @@ int vme_dma_list_free(struct vme_dma_list *list) */ retval =3D bridge->dma_list_empty(list); if (retval) { - printk(KERN_ERR "Unable to empty link-list entries\n"); + dev_err(bridge->parent, "Unable to empty link-list entries\n"); mutex_unlock(&list->mtx); return retval; } @@ -1197,22 +1213,24 @@ EXPORT_SYMBOL(vme_dma_list_free); */ int vme_dma_free(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_dma_resource *ctrlr; =20 if (resource->type !=3D VME_DMA) { - printk(KERN_ERR "Not a DMA resource\n"); + dev_err(bridge->parent, "Not a DMA resource\n"); return -EINVAL; } =20 ctrlr =3D list_entry(resource->entry, struct vme_dma_resource, list); =20 if (!mutex_trylock(&ctrlr->mtx)) { - printk(KERN_ERR "Resource busy, can't free\n"); + dev_err(bridge->parent, "Resource busy, can't free\n"); return -EBUSY; } =20 if (!(list_empty(&ctrlr->pending) && list_empty(&ctrlr->running))) { - printk(KERN_WARNING "Resource still processing transfers\n"); + dev_warn(bridge->parent, + "Resource still processing transfers\n"); mutex_unlock(&ctrlr->mtx); return -EBUSY; } @@ -1290,8 +1308,9 @@ void vme_irq_handler(struct vme_bridge *bridge, int l= evel, int statid) if (call) call(level, statid, priv_data); else - printk(KERN_WARNING "Spurious VME interrupt, level:%x, vector:%x\n", - level, statid); + dev_warn(bridge->parent, + "Spurious VME interrupt, level:%x, vector:%x\n", level, + statid); } EXPORT_SYMBOL(vme_irq_handler); =20 @@ -1319,17 +1338,18 @@ int vme_irq_request(struct vme_dev *vdev, int level= , int statid, =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); return -EINVAL; } =20 if ((level < 1) || (level > 7)) { - printk(KERN_ERR "Invalid interrupt level\n"); + dev_err(bridge->parent, "Invalid interrupt level\n"); return -EINVAL; } =20 if (!bridge->irq_set) { - printk(KERN_ERR "Configuring interrupts not supported\n"); + dev_err(bridge->parent, + "Configuring interrupts not supported\n"); return -EINVAL; } =20 @@ -1337,7 +1357,7 @@ int vme_irq_request(struct vme_dev *vdev, int level, = int statid, =20 if (bridge->irq[level - 1].callback[statid].func) { mutex_unlock(&bridge->irq_mtx); - printk(KERN_WARNING "VME Interrupt already taken\n"); + dev_warn(bridge->parent, "VME Interrupt already taken\n"); return -EBUSY; } =20 @@ -1368,17 +1388,18 @@ void vme_irq_free(struct vme_dev *vdev, int level, = int statid) =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); return; } =20 if ((level < 1) || (level > 7)) { - printk(KERN_ERR "Invalid interrupt level\n"); + dev_err(bridge->parent, "Invalid interrupt level\n"); return; } =20 if (!bridge->irq_set) { - printk(KERN_ERR "Configuring interrupts not supported\n"); + dev_err(bridge->parent, + "Configuring interrupts not supported\n"); return; } =20 @@ -1415,17 +1436,18 @@ int vme_irq_generate(struct vme_dev *vdev, int leve= l, int statid) =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); return -EINVAL; } =20 if ((level < 1) || (level > 7)) { - printk(KERN_WARNING "Invalid interrupt level\n"); + dev_warn(bridge->parent, "Invalid interrupt level\n"); return -EINVAL; } =20 if (!bridge->irq_generate) { - printk(KERN_WARNING "Interrupt generation not supported\n"); + dev_warn(bridge->parent, + "Interrupt generation not supported\n"); return -EINVAL; } =20 @@ -1452,14 +1474,15 @@ struct vme_resource *vme_lm_request(struct vme_dev = *vdev) =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); goto err_bus; } =20 /* Loop through LM resources */ list_for_each_entry(lm, &bridge->lm_resources, list) { if (!lm) { - printk(KERN_ERR "Registered NULL Location Monitor resource\n"); + dev_err(bridge->parent, + "Registered NULL Location Monitor resource\n"); continue; } =20 @@ -1511,10 +1534,11 @@ EXPORT_SYMBOL(vme_lm_request); */ int vme_lm_count(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_lm_resource *lm; =20 if (resource->type !=3D VME_LM) { - printk(KERN_ERR "Not a Location Monitor resource\n"); + dev_err(bridge->parent, "Not a Location Monitor resource\n"); return -EINVAL; } =20 @@ -1545,14 +1569,14 @@ int vme_lm_set(struct vme_resource *resource, unsig= ned long long lm_base, struct vme_lm_resource *lm; =20 if (resource->type !=3D VME_LM) { - printk(KERN_ERR "Not a Location Monitor resource\n"); + dev_err(bridge->parent, "Not a Location Monitor resource\n"); return -EINVAL; } =20 lm =3D list_entry(resource->entry, struct vme_lm_resource, list); =20 if (!bridge->lm_set) { - printk(KERN_ERR "vme_lm_set not supported\n"); + dev_err(bridge->parent, "vme_lm_set not supported\n"); return -EINVAL; } =20 @@ -1581,14 +1605,14 @@ int vme_lm_get(struct vme_resource *resource, unsig= ned long long *lm_base, struct vme_lm_resource *lm; =20 if (resource->type !=3D VME_LM) { - printk(KERN_ERR "Not a Location Monitor resource\n"); + dev_err(bridge->parent, "Not a Location Monitor resource\n"); return -EINVAL; } =20 lm =3D list_entry(resource->entry, struct vme_lm_resource, list); =20 if (!bridge->lm_get) { - printk(KERN_ERR "vme_lm_get not supported\n"); + dev_err(bridge->parent, "vme_lm_get not supported\n"); return -EINVAL; } =20 @@ -1618,14 +1642,14 @@ int vme_lm_attach(struct vme_resource *resource, in= t monitor, struct vme_lm_resource *lm; =20 if (resource->type !=3D VME_LM) { - printk(KERN_ERR "Not a Location Monitor resource\n"); + dev_err(bridge->parent, "Not a Location Monitor resource\n"); return -EINVAL; } =20 lm =3D list_entry(resource->entry, struct vme_lm_resource, list); =20 if (!bridge->lm_attach) { - printk(KERN_ERR "vme_lm_attach not supported\n"); + dev_err(bridge->parent, "vme_lm_attach not supported\n"); return -EINVAL; } =20 @@ -1651,14 +1675,14 @@ int vme_lm_detach(struct vme_resource *resource, in= t monitor) struct vme_lm_resource *lm; =20 if (resource->type !=3D VME_LM) { - printk(KERN_ERR "Not a Location Monitor resource\n"); + dev_err(bridge->parent, "Not a Location Monitor resource\n"); return -EINVAL; } =20 lm =3D list_entry(resource->entry, struct vme_lm_resource, list); =20 if (!bridge->lm_detach) { - printk(KERN_ERR "vme_lm_detach not supported\n"); + dev_err(bridge->parent, "vme_lm_detach not supported\n"); return -EINVAL; } =20 @@ -1680,10 +1704,11 @@ EXPORT_SYMBOL(vme_lm_detach); */ void vme_lm_free(struct vme_resource *resource) { + struct vme_bridge *bridge =3D find_bridge(resource); struct vme_lm_resource *lm; =20 if (resource->type !=3D VME_LM) { - printk(KERN_ERR "Not a Location Monitor resource\n"); + dev_err(bridge->parent, "Not a Location Monitor resource\n"); return; } =20 @@ -1720,12 +1745,12 @@ int vme_slot_num(struct vme_dev *vdev) =20 bridge =3D vdev->bridge; if (!bridge) { - printk(KERN_ERR "Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); return -EINVAL; } =20 if (!bridge->slot_get) { - printk(KERN_WARNING "vme_slot_num not supported\n"); + dev_warn(bridge->parent, "vme_slot_num not supported\n"); return -EINVAL; } =20 @@ -1748,7 +1773,7 @@ int vme_bus_num(struct vme_dev *vdev) =20 bridge =3D vdev->bridge; if (!bridge) { - pr_err("Can't find VME bus\n"); + dev_err(&vdev->dev, "Can't find VME bus\n"); return -EINVAL; } =20 --=20 2.42.0