* [PATCH 08/33] vfio: use match_string() helper
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
@ 2018-05-21 11:57 ` Yisheng Xie
2018-05-25 20:55 ` Alex Williamson
0 siblings, 1 reply; 2+ messages in thread
From: Yisheng Xie @ 2018-05-21 11:57 UTC (permalink / raw)
To: linux-kernel; +Cc: Yisheng Xie, Alex Williamson, kvm
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
drivers/vfio/vfio.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 721f97f..6483387 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -630,8 +630,6 @@ static struct vfio_device *vfio_group_get_device(struct vfio_group *group,
static bool vfio_dev_whitelisted(struct device *dev, struct device_driver *drv)
{
- int i;
-
if (dev_is_pci(dev)) {
struct pci_dev *pdev = to_pci_dev(dev);
@@ -639,12 +637,9 @@ static bool vfio_dev_whitelisted(struct device *dev, struct device_driver *drv)
return true;
}
- for (i = 0; i < ARRAY_SIZE(vfio_driver_whitelist); i++) {
- if (!strcmp(drv->name, vfio_driver_whitelist[i]))
- return true;
- }
-
- return false;
+ return match_string(vfio_driver_whitelist,
+ ARRAY_SIZE(vfio_driver_whitelist),
+ drv->name) >= 0;
}
/*
--
1.7.12.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 08/33] vfio: use match_string() helper
2018-05-21 11:57 ` [PATCH 08/33] vfio: use match_string() helper Yisheng Xie
@ 2018-05-25 20:55 ` Alex Williamson
0 siblings, 0 replies; 2+ messages in thread
From: Alex Williamson @ 2018-05-25 20:55 UTC (permalink / raw)
To: Yisheng Xie; +Cc: linux-kernel, kvm
On Mon, 21 May 2018 19:57:45 +0800
Yisheng Xie <xieyisheng1@huawei.com> wrote:
> match_string() returns the index of an array for a matching string,
> which can be used intead of open coded variant.
>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Cc: kvm@vger.kernel.org
> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
> ---
> drivers/vfio/vfio.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
Applied to the vfio next branch for v4.18 with Andy's R-b. Thanks,
Alex
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 721f97f..6483387 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -630,8 +630,6 @@ static struct vfio_device *vfio_group_get_device(struct vfio_group *group,
>
> static bool vfio_dev_whitelisted(struct device *dev, struct device_driver *drv)
> {
> - int i;
> -
> if (dev_is_pci(dev)) {
> struct pci_dev *pdev = to_pci_dev(dev);
>
> @@ -639,12 +637,9 @@ static bool vfio_dev_whitelisted(struct device *dev, struct device_driver *drv)
> return true;
> }
>
> - for (i = 0; i < ARRAY_SIZE(vfio_driver_whitelist); i++) {
> - if (!strcmp(drv->name, vfio_driver_whitelist[i]))
> - return true;
> - }
> -
> - return false;
> + return match_string(vfio_driver_whitelist,
> + ARRAY_SIZE(vfio_driver_whitelist),
> + drv->name) >= 0;
> }
>
> /*
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-25 20:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
2018-05-21 11:57 ` [PATCH 08/33] vfio: use match_string() helper Yisheng Xie
2018-05-25 20:55 ` Alex Williamson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox