From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753356AbdBAQ4t (ORCPT ); Wed, 1 Feb 2017 11:56:49 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:52987 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753099AbdBAQ4p (ORCPT ); Wed, 1 Feb 2017 11:56:45 -0500 From: Christopher Bostic To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, gregkh@linuxfoundation.org, mturquette@baylibre.com, geert+renesas@glider.be, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, joel@jms.id.au, linux-kernel@vger.kernel.org, andrew@aj.id.au, alistair@popple.id.au, benh@kernel.crashing.org Cc: Chris Bostic Subject: [PATCH v3 14/18] drivers/fsi: Remove all scanned devices during master unregister Date: Wed, 1 Feb 2017 10:53:54 -0600 X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170201165358.45415-1-cbostic@linux.vnet.ibm.com> References: <20170201165358.45415-1-cbostic@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17020116-0040-0000-0000-000002852EE6 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006537; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000201; SDB=6.00815769; UDB=6.00398295; IPR=6.00593211; BA=6.00005108; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014138; XFM=3.00000011; UTC=2017-02-01 16:56:44 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17020116-0041-0000-0000-00000678385A Message-Id: <20170201165358.45415-15-cbostic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-01_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702010167 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Bostic Master will remove all previously scanned devices during an unregister operation. This will be necessary should any master attempt to register more than once. Signed-off-by: Chris Bostic --- drivers/fsi/fsi-core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index af7965f..28b82d1 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -428,12 +428,26 @@ int fsi_master_register(struct fsi_master *master) } EXPORT_SYMBOL_GPL(fsi_master_register); +static int fsi_slave_device_remove(struct device *dev, void *data) +{ + put_device(dev); + return 0; +} + +static int fsi_master_slave_remove(struct device *dev, void *data) +{ + device_for_each_child(dev, NULL, fsi_slave_device_remove); + device_unregister(dev); + return 0; +} + void fsi_master_unregister(struct fsi_master *master) { if (!master || !master->dev) return; ida_simple_remove(&master_ida, master->idx); + device_for_each_child(master->dev, NULL, fsi_master_slave_remove); put_device(master->dev); } EXPORT_SYMBOL_GPL(fsi_master_unregister); -- 1.8.2.2