2007-10-13 19:07:34

by Jeff Garzik

Subject: [PATCH] drivers/pci, drivers/dma: kill unused vars

Kill two never-used (not even in hidden debug macros) variables,
noticed by the compiler.

Signed-off-by: Jeff Garzik <[email protected]>
---
drivers/dma/ioatdma.c | 1 -
drivers/pci/hotplug/pci_hotplug_core.c | 2 --
2 files changed, 3 deletions(-)

diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 41b18c5..d9db64b 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -244,7 +244,6 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);
struct ioat_device *ioat_device = to_ioat_device(chan->device);
struct ioat_desc_sw *desc, *_desc;
- u16 chanctrl;
int in_use_descs = 0;

ioat_dma_memcpy_cleanup(ioat_chan);
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index f0eba53..01c351c 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -689,8 +689,6 @@ int pci_hp_deregister (struct hotplug_slot *slot)
int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
struct hotplug_slot_info *info)
{
- int retval;
-
if ((slot == NULL) || (info == NULL))
return -ENODEV;

2007-10-15 16:05:41

by Shannon Nelson

Subject: RE: [PATCH] drivers/pci, drivers/dma: kill unused vars

>-----Original Message-----
>From: Jeff Garzik [mailto:[email protected]]
>Sent: Saturday, October 13, 2007 12:07 PM
>To: Andrew Morton; Linus Torvalds
>Cc: LKML; Greg KH; Nelson, Shannon; Williams, Dan J
>Subject: [PATCH] drivers/pci, drivers/dma: kill unused vars
>
>
>Kill two never-used (not even in hidden debug macros) variables,
>noticed by the compiler.
>
>Signed-off-by: Jeff Garzik <[email protected]>
>---
> drivers/dma/ioatdma.c | 1 -
> drivers/pci/hotplug/pci_hotplug_core.c | 2 --
> 2 files changed, 3 deletions(-)
>
>diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
>index 41b18c5..d9db64b 100644
>--- a/drivers/dma/ioatdma.c
>+++ b/drivers/dma/ioatdma.c
>@@ -244,7 +244,6 @@ static void
>ioat_dma_free_chan_resources(struct dma_chan *chan)
> struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);
> struct ioat_device *ioat_device = to_ioat_device(chan->device);
> struct ioat_desc_sw *desc, *_desc;
>- u16 chanctrl;
> int in_use_descs = 0;
>
> ioat_dma_memcpy_cleanup(ioat_chan);

Acked-by: Shannon Nelson <[email protected]>

FYI - this code gets heavily revised by ioat patches in -mm that Andrew
is planning on merging soon.

sln

>diff --git a/drivers/pci/hotplug/pci_hotplug_core.c
>b/drivers/pci/hotplug/pci_hotplug_core.c
>index f0eba53..01c351c 100644
>--- a/drivers/pci/hotplug/pci_hotplug_core.c
>+++ b/drivers/pci/hotplug/pci_hotplug_core.c
>@@ -689,8 +689,6 @@ int pci_hp_deregister (struct hotplug_slot *slot)
> int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
> struct hotplug_slot_info *info)
> {
>- int retval;
>-
> if ((slot == NULL) || (info == NULL))
> return -ENODEV;
>
>