From b2936d3ac4e6d39ec83ef57a3af9b7d4af14039f Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 24 Mar 2003 23:02:09 -0600 Subject: [PATCH] [PATCH] fix rescan warning The prototype for scsi_rescan_device was missing and once added it's caller doesn't compile anymore because it expects a return value.. --- drivers/scsi/scsi.h | 1 + drivers/scsi/scsi_sysfs.c | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h index c7178e1f75e6d..66c3682d2b2c4 100644 --- a/drivers/scsi/scsi.h +++ b/drivers/scsi/scsi.h @@ -442,6 +442,7 @@ extern void scsi_finish_command(Scsi_Cmnd *); extern int scsi_retry_command(Scsi_Cmnd *); extern int scsi_attach_device(struct scsi_device *); extern void scsi_detach_device(struct scsi_device *); +extern void scsi_rescan_device(struct scsi_device *); extern int scsi_get_device_flags(unsigned char *vendor, unsigned char *model); /* diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 4ecaa390ebdcb..a563e624d1210 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -275,12 +275,8 @@ show_rescan_field (struct device *dev, char *buf) static ssize_t store_rescan_field (struct device *dev, const char *buf, size_t count) { - int ret = ENODEV; - struct scsi_device *sdev; - sdev = to_scsi_device(dev); - if (sdev) - ret = scsi_rescan_device(sdev); - return ret; + scsi_rescan_device(to_scsi_device(dev)); + return 0; } static DEVICE_ATTR(rescan, S_IRUGO | S_IWUSR, show_rescan_field, store_rescan_field) -- 2.53.0