[PATCH (trivial) 2/2] SCSI: simplify scsi_remove_target()

[PATCH (trivial) 2/2] SCSI: simplify scsi_remove_target()

[Alan Stern]

This trivial patch (as1340) eliminates an unnecessary local variable
from scsi_remove_target().

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

Index: usb-2.6/drivers/scsi/scsi_sysfs.c
===================================================================
--- usb-2.6.orig/drivers/scsi/scsi_sysfs.c
+++ usb-2.6/drivers/scsi/scsi_sysfs.c
@@ -1020,16 +1020,14 @@ static int __remove_child (struct device
  */
 void scsi_remove_target(struct device *dev)
 {
-	struct device *rdev;
-
 	if (scsi_is_target_device(dev)) {
 		__scsi_remove_target(to_scsi_target(dev));
 		return;
 	}
 
-	rdev = get_device(dev);
+	get_device(dev);
 	device_for_each_child(dev, NULL, __remove_child);
-	put_device(rdev);
+	put_device(dev);
 }
 EXPORT_SYMBOL(scsi_remove_target);
 

Re: [PATCH (trivial) 2/2] SCSI: simplify scsi_remove_target()

[Jiri Kosina]

On Mon, 15 Nov 2010, Alan Stern wrote:

> This trivial patch (as1340) eliminates an unnecessary local variable
> from scsi_remove_target().
> 
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> 
> ---
> 
> Index: usb-2.6/drivers/scsi/scsi_sysfs.c
> ===================================================================
> --- usb-2.6.orig/drivers/scsi/scsi_sysfs.c
> +++ usb-2.6/drivers/scsi/scsi_sysfs.c
> @@ -1020,16 +1020,14 @@ static int __remove_child (struct device
>   */
>  void scsi_remove_target(struct device *dev)
>  {
> -	struct device *rdev;
> -
>  	if (scsi_is_target_device(dev)) {
>  		__scsi_remove_target(to_scsi_target(dev));
>  		return;
>  	}
>  
> -	rdev = get_device(dev);
> +	get_device(dev);
>  	device_for_each_child(dev, NULL, __remove_child);
> -	put_device(rdev);
> +	put_device(dev);
>  }
>  EXPORT_SYMBOL(scsi_remove_target);

The code seems to be reshuffled a little bit in -next, so this'd better go 
through SCSI tree to avoid unnecessary conflicts between trees in next.

James, are you going to pick it up?

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH (trivial) 2/2] SCSI: simplify scsi_remove_target()

[James Bottomley]

On Wed, 2010-12-22 at 12:21 +0100, Jiri Kosina wrote:
> On Mon, 15 Nov 2010, Alan Stern wrote:
> 
> > This trivial patch (as1340) eliminates an unnecessary local variable
> > from scsi_remove_target().
> > 
> > Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> > 
> > ---
> > 
> > Index: usb-2.6/drivers/scsi/scsi_sysfs.c
> > ===================================================================
> > --- usb-2.6.orig/drivers/scsi/scsi_sysfs.c
> > +++ usb-2.6/drivers/scsi/scsi_sysfs.c
> > @@ -1020,16 +1020,14 @@ static int __remove_child (struct device
> >   */
> >  void scsi_remove_target(struct device *dev)
> >  {
> > -	struct device *rdev;
> > -
> >  	if (scsi_is_target_device(dev)) {
> >  		__scsi_remove_target(to_scsi_target(dev));
> >  		return;
> >  	}
> >  
> > -	rdev = get_device(dev);
> > +	get_device(dev);
> >  	device_for_each_child(dev, NULL, __remove_child);
> > -	put_device(rdev);
> > +	put_device(dev);
> >  }
> >  EXPORT_SYMBOL(scsi_remove_target);
> 
> The code seems to be reshuffled a little bit in -next, so this'd better go 
> through SCSI tree to avoid unnecessary conflicts between trees in next.
> 
> James, are you going to pick it up?

I've got it in my queue ... it depends how much more trouble we get
integrating driver patches (and the tightness of the merge window
deadline, since some people suspect a christmas release).

James