2014-04-14 22:25:27

by Bjorn Helgaas

[permalink] [raw]
Subject: [PATCH] xen/pci: Remove unused dev_err() string

We previously verified that "action" is either BUS_NOTIFY_ADD_DEVICE or
BUS_NOTIFY_DEL_DEVICE, so there's no need for the default "?" case.

Found by Coverity (CID 146520).

Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/xen/pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
index dd9c249ea311..59a25f937bd7 100644
--- a/drivers/xen/pci.c
+++ b/drivers/xen/pci.c
@@ -177,8 +177,7 @@ static int xen_pci_notifier(struct notifier_block *nb,
}
if (r)
dev_err(dev, "Failed to %s - passthrough or MSI/MSI-X might fail!\n",
- action == BUS_NOTIFY_ADD_DEVICE ? "add" :
- (action == BUS_NOTIFY_DEL_DEVICE ? "delete" : "?"));
+ action == BUS_NOTIFY_ADD_DEVICE ? "add" : "del");
return NOTIFY_OK;
}


2014-04-15 13:03:33

by Konrad Rzeszutek Wilk

[permalink] [raw]
Subject: Re: [PATCH] xen/pci: Remove unused dev_err() string

On Mon, Apr 14, 2014 at 04:25:23PM -0600, Bjorn Helgaas wrote:
> We previously verified that "action" is either BUS_NOTIFY_ADD_DEVICE or
> BUS_NOTIFY_DEL_DEVICE, so there's no need for the default "?" case.
>
> Found by Coverity (CID 146520).

Reviewed-by: Konrad Rzeszutek Wilk <[email protected]>

David, are you OK pushing this in 'devel/for-linus-3.14'?

Thanks!
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
> ---
> drivers/xen/pci.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
> index dd9c249ea311..59a25f937bd7 100644
> --- a/drivers/xen/pci.c
> +++ b/drivers/xen/pci.c
> @@ -177,8 +177,7 @@ static int xen_pci_notifier(struct notifier_block *nb,
> }
> if (r)
> dev_err(dev, "Failed to %s - passthrough or MSI/MSI-X might fail!\n",
> - action == BUS_NOTIFY_ADD_DEVICE ? "add" :
> - (action == BUS_NOTIFY_DEL_DEVICE ? "delete" : "?"));
> + action == BUS_NOTIFY_ADD_DEVICE ? "add" : "del");
> return NOTIFY_OK;
> }
>
>

2014-04-15 13:29:20

by David Vrabel

[permalink] [raw]
Subject: Re: [PATCH] xen/pci: Remove unused dev_err() string

On 15/04/14 14:03, Konrad Rzeszutek Wilk wrote:
> On Mon, Apr 14, 2014 at 04:25:23PM -0600, Bjorn Helgaas wrote:
>> We previously verified that "action" is either BUS_NOTIFY_ADD_DEVICE or
>> BUS_NOTIFY_DEL_DEVICE, so there's no need for the default "?" case.
>>
>> Found by Coverity (CID 146520).
>
> Reviewed-by: Konrad Rzeszutek Wilk <[email protected]>
>
> David, are you OK pushing this in 'devel/for-linus-3.14'?

If you mean devel/for-linus-3.16, then yes.

David

2014-04-15 15:20:16

by Konrad Rzeszutek Wilk

[permalink] [raw]
Subject: Re: [PATCH] xen/pci: Remove unused dev_err() string

On Tue, Apr 15, 2014 at 02:29:16PM +0100, David Vrabel wrote:
> On 15/04/14 14:03, Konrad Rzeszutek Wilk wrote:
> > On Mon, Apr 14, 2014 at 04:25:23PM -0600, Bjorn Helgaas wrote:
> >> We previously verified that "action" is either BUS_NOTIFY_ADD_DEVICE or
> >> BUS_NOTIFY_DEL_DEVICE, so there's no need for the default "?" case.
> >>
> >> Found by Coverity (CID 146520).
> >
> > Reviewed-by: Konrad Rzeszutek Wilk <[email protected]>
> >
> > David, are you OK pushing this in 'devel/for-linus-3.14'?
>
> If you mean devel/for-linus-3.16, then yes.

Yes I meant that. Thanks!
>
> David