Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v1] driver core: Use list_del_init to replace list_del at
 device_links_purge()
To:     James Bottomley <jejb@linux.ibm.com>,
        Greg KH <gregkh@linuxfoundation.org>
CC:     luojiaxing <luojiaxing@huawei.com>,
        "saravanak@google.com" <saravanak@google.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Linuxarm <linuxarm@huawei.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        Arnd Bergmann <arnd@arndb.de>
References: <1578483244-50723-1-git-send-email-luojiaxing@huawei.com>
 <20200108122658.GA2365903@kroah.com>
 <73252c08-ac46-5d0d-23ec-16c209bd9b9a@huawei.com>
 <1578498695.3260.5.camel@linux.ibm.com> <20200108155700.GA2459586@kroah.com>
 <1578499287.3260.7.camel@linux.ibm.com>
From:   John Garry <john.garry@huawei.com>
Message-ID: <4b185c9f-7fa2-349d-9f72-3c787ac30377@huawei.com>
Date:   Wed, 8 Jan 2020 16:08:44 +0000
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.1.2
MIME-Version: 1.0
In-Reply-To: <1578499287.3260.7.camel@linux.ibm.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 08/01/2020 16:01, James Bottomley wrote:
>>>> 	cdev->dev = NULL;
>>>> 			return device_add(&cdev->cdev);
>>>> 		}
>>>> 	}
>>>> 	return -ENODEV;
>>>> }
>>> The design of the code is simply to remove the link to the inserted
>>> device which has been removed.
>>>
>>> I*think*  this means the calls to device_del and device_add are
>>> unnecessary and should go.  enclosure_remove_links and the put of
>>> the
>>> enclosed device should be sufficient.
>> That would make more sense than trying to "reuse" the device
>> structure
>> here by tearing it down and adding it back.
> OK, let's try that.  This should be the patch if someone can try it
> (I've compile tested it, but the enclosure system is under a heap of
> stuff in the garage).

I can test it now.

But it is a bit suspicious that we had the device_del() and device_add() 
at all, especially since the code change makes it look a bit more like 
pre-43d8eb9cfd0 ("ses: add support for enclosure component hot removal")

John

> 
> James
> 
> ---
> 
> diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
> index 6d27ccfe0680..3c2d405bc79b 100644
> --- a/drivers/misc/enclosure.c
> +++ b/drivers/misc/enclosure.c
> @@ -406,10 +406,9 @@ int enclosure_remove_device(struct enclosure_device *edev, struct device *dev)
>   		cdev = &edev->component[i];
>   		if (cdev->dev == dev) {
>   			enclosure_remove_links(cdev);
> -			device_del(&cdev->cdev);
>   			put_device(dev);
>   			cdev->dev = NULL;
> -			return device_add(&cdev->cdev);
> +			return 0;
>   		}
>   	}
>   	return -ENODEV;