mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Robert Love <rml@tech9.net>
To: hch@infradead.org, axboe@suse.de, mochel@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [patch] scsi-sysfs bug fix
Date: 19 Mar 2003 15:51:20 -0500	[thread overview]
Message-ID: <1048107080.775.96.camel@phantasy.awol.org> (raw)

[ Apologies for sending this to all the usual suspects here ... ]

drivers/scsi/scsi_sysfs.c :: store_rescan_field() calls
scsi_rescan_device() without a prototype, and thus results in a compiler
warning.

Fix that up by adding the prototype to scsi.h, where it belongs.

But then we see we are storing the return value of a void function (so
that is why ANSI C is good)... so fix that up, too, by setting the
return value to zero if a valid device was found.  Otherwise, return
ENODEV as before.

Patch is against 2.5.65.

	Robert Love


 drivers/scsi/scsi.h       |    1 +
 drivers/scsi/scsi_sysfs.c |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)


diff -urN linux-2.5.65/drivers/scsi/scsi.h linux/drivers/scsi/scsi.h
--- linux-2.5.65/drivers/scsi/scsi.h	2003-03-19 15:44:06.279618904 -0500
+++ linux/drivers/scsi/scsi.h	2003-03-19 15:39:47.355981280 -0500
@@ -443,6 +443,7 @@
 extern int scsi_attach_device(struct scsi_device *);
 extern void scsi_detach_device(struct scsi_device *);
 extern int scsi_get_device_flags(unsigned char *vendor, unsigned char *model);
+extern void scsi_rescan_device(struct scsi_device *sdev);
 
 /*
  * Newer request-based interfaces.
diff -urN linux-2.5.65/drivers/scsi/scsi_sysfs.c linux/drivers/scsi/scsi_sysfs.c
--- linux-2.5.65/drivers/scsi/scsi_sysfs.c	2003-03-19 15:44:06.196631520 -0500
+++ linux/drivers/scsi/scsi_sysfs.c	2003-03-19 15:42:45.249937288 -0500
@@ -278,8 +278,10 @@
 	int ret = ENODEV;
 	struct scsi_device *sdev;
 	sdev = to_scsi_device(dev);
-	if (sdev)
-		ret = scsi_rescan_device(sdev);
+	if (sdev) {
+		ret = 0;
+		scsi_rescan_device(sdev);
+	}
 	return ret;
 }
 




             reply	other threads:[~2003-03-19 20:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-03-19 20:51 Robert Love [this message]
2003-03-19 23:56 Douglas Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1048107080.775.96.camel@phantasy.awol.org \
    --to=rml@tech9.net \
    --cc=axboe@suse.de \
    --cc=hch@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mochel@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®