2011-02-26 23:15:57

by Manohar Vanga

Subject: [PATCH 0/1] staging: vme: remove some more unreachable code

This patch removes some more unreachable code found in
bridges/vme_ca91cx42.c and bridges/vme_tsi148.c.

Thanks,
Manohar Vanga

Manohar Vanga (1):
staging: vme: remove unreachable code

drivers/staging/vme/bridges/vme_ca91cx42.c | 3 ---
drivers/staging/vme/bridges/vme_tsi148.c | 2 --
2 files changed, 0 insertions(+), 5 deletions(-)

2011-02-26 23:16:20

by Manohar Vanga

Subject: [PATCH 1/1] staging: vme: remove unreachable code

Remove some more unreachable code found in bridges/vme_ca91cx42.c
and bridges/vme_tsi148.c

Signed-off-by: Manohar Vanga <[email protected]>
---
drivers/staging/vme/bridges/vme_ca91cx42.c | 3 ---
drivers/staging/vme/bridges/vme_tsi148.c | 2 --
2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 42de83e..5d734d9 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -560,8 +560,6 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,

return 0;

- iounmap(image->kern_base);
- image->kern_base = NULL;
err_remap:
release_resource(&image->bus_resource);
err_resource:
@@ -1782,7 +1780,6 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)

return 0;

- vme_unregister_bridge(ca91cx42_bridge);
err_reg:
ca91cx42_crcsr_exit(ca91cx42_bridge, pdev);
err_lm:
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index 26ea42f..2df19ea 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -869,8 +869,6 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,

return 0;

- iounmap(image->kern_base);
- image->kern_base = NULL;
err_remap:
release_resource(&image->bus_resource);
err_resource:
--
1.7.1

2011-03-01 15:35:13

by Martyn Welch

Subject: Re: [PATCH 1/1] staging: vme: remove unreachable code

On 26/02/11 23:15, Manohar Vanga wrote:
> Remove some more unreachable code found in bridges/vme_ca91cx42.c
> and bridges/vme_tsi148.c
>
> Signed-off-by: Manohar Vanga <[email protected]>

Acked-by Martyn Welch <[email protected]>

> ---
> drivers/staging/vme/bridges/vme_ca91cx42.c | 3 ---
> drivers/staging/vme/bridges/vme_tsi148.c | 2 --
> 2 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
> index 42de83e..5d734d9 100644
> --- a/drivers/staging/vme/bridges/vme_ca91cx42.c
> +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
> @@ -560,8 +560,6 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
>
> return 0;
>
> - iounmap(image->kern_base);
> - image->kern_base = NULL;
> err_remap:
> release_resource(&image->bus_resource);
> err_resource:
> @@ -1782,7 +1780,6 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>
> return 0;
>
> - vme_unregister_bridge(ca91cx42_bridge);
> err_reg:
> ca91cx42_crcsr_exit(ca91cx42_bridge, pdev);
> err_lm:
> diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
> index 26ea42f..2df19ea 100644
> --- a/drivers/staging/vme/bridges/vme_tsi148.c
> +++ b/drivers/staging/vme/bridges/vme_tsi148.c
> @@ -869,8 +869,6 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
>
> return 0;
>
> - iounmap(image->kern_base);
> - image->kern_base = NULL;
> err_remap:
> release_resource(&image->bus_resource);
> err_resource:


--
Martyn Welch (Principal Software Engineer) | Registered in England and
GE Intelligent Platforms | Wales (3828642) at 100
T +44(0)127322748 | Barbirolli Square, Manchester,
E [email protected] | M2 3AB VAT:GB 927559189