On Mon, Sep 06, 2010 at 04:59:11PM -0700, Nicholas A. Bellinger wrote:
> From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
>
> Hi Dough and Co,
>
> This patch updates the scsi_debug virtual LLD to use root_device_register()
> and root_device_unregister() from include/linux/device.h instead of device_register()
> and device_unregister() respectively within scsi_debug_init() and scsi_debug_exit()
> This simply involved converting the static struct device pseudo_primary into a
> pointer that is setup by the call to root_device_register().
>
> This patch also contains the correct IS_ERR() conditional check of
> root_device_register() from within scsi_debug_init().
>
> Thanks to Richard Sharpe and Dmitry Torokhov for their help with this item.
>
> Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
> ---
> drivers/scsi/scsi_debug.c | 27 +++++++++------------------
> 1 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index b02bdc6..86d483e 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -3207,23 +3207,14 @@ static void do_remove_driverfs_files(void)
> driver_remove_file(&sdebug_driverfs_driver, &driver_attr_add_host);
> }
>
> -static void pseudo_0_release(struct device *dev)
> -{
> - if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)
> - printk(KERN_INFO "scsi_debug: pseudo_0_release() called\n");
> -}
> -
> -static struct device pseudo_primary = {
> - .init_name = "pseudo_0",
> - .release = pseudo_0_release,
> -};
> +struct device *pseudo_primary;
>
> static int __init scsi_debug_init(void)
> {
> unsigned long sz;
> int host_to_add;
> int k;
> - int ret;
> + int ret = 0;
Please drop this chunk, it is not needed and is dangerous WRT future
changes to the file as I explained earlier.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
