scsi: ufs: cleanup UFS driver
v3 cover scsi: ufs: cleanup UFS driver
From: Bean Huo <[email protected]>
Cleanup, no functional change
Changelog:
v2 -v3:
1. Change SPDX-License-Identifier: GPL-2.0 to
SPDX-License-Identifier: GPL-2.0-or-later (Eric Biggers)
v1 - v2:
1. Split patch (Tomas Winkler)
Bean Huo (2):
scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
scsi: ufs: remove wrapper function ufshcd_setup_clocks()
drivers/scsi/ufs/ufs.h | 27 +------------- drivers/scsi/ufs/ufshcd-pci.c | 25 +------------ drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +------------- drivers/scsi/ufs/ufshcd.c | 62 +++++++------------------------- drivers/scsi/ufs/ufshcd.h | 27 +------------- drivers/scsi/ufs/ufshci.h | 27 +------------- 6 files changed, 18 insertions(+), 177 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
From: Bean Huo <[email protected]>
Add SPDX GPL-2.0 to UFS driver files that specified the GPL version 2 license, remove the full boilerplate text.
--- drivers/scsi/ufs/ufs.h | 27 +-------------------------- drivers/scsi/ufs/ufshcd-pci.c | 25 +------------------------ drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +-------------------------- drivers/scsi/ufs/ufshcd.c | 30 +----------------------------- drivers/scsi/ufs/ufshcd.h | 27 +-------------------------- drivers/scsi/ufs/ufshci.h | 27 +-------------------------- 6 files changed, 6 insertions(+), 157 deletions(-)
drivers/scsi/ufs/ufs.h +1 -26
@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufs.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef _UFS_H
drivers/scsi/ufs/ufshcd-pci.c +1 -24
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller PCI glue driver *
@@ -7,30 +8,6 @@* Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #include "ufshcd.h"
drivers/scsi/ufs/ufshcd-pltfrm.c +1 -26
@@ -1,36 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller Platform bus based glue driver -* -* This code is based on drivers/scsi/ufs/ufshcd-pltfrm.c * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #include <linux/platform_device.h>
drivers/scsi/ufs/ufshcd.c +1 -29
@@ -1,40 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller driver Core -* -* This code is based on drivers/scsi/ufs/ufshcd.c * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. -* -* The Linux Foundation chooses to take subject only to the GPLv2 -* license terms, and distributes only under these terms. */ #include <linux/async.h>
drivers/scsi/ufs/ufshcd.h +1 -26
@@ -1,37 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshcd.h * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef _UFSHCD_H
drivers/scsi/ufs/ufshci.h +1 -26
@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshci.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef _UFSHCI_H
Signature · 1 line
2.17.1
RE: [PATCH v3 1/2] scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
Quoted 7 lines
From: Bean Huo <[email protected]>
Add SPDX GPL-2.0 to UFS driver files that specified the GPL version 2 license, remove the full boilerplate text.
Signed-off-by Bean Huo <[email protected]>
LGTM.
Thanks
Tomas
Quoted 266 lines
--- drivers/scsi/ufs/ufs.h | 27 +-------------------------- drivers/scsi/ufs/ufshcd-pci.c | 25 +------------------------ drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +-------------------------- drivers/scsi/ufs/ufshcd.c | 30 +----------------------------- drivers/scsi/ufs/ufshcd.h | 27 +-------------------------- drivers/scsi/ufs/ufshci.h | 27 +-------------------------- 6 files changed, 6 insertions(+), 157 deletions(-)drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0
-0
c70845d41449..7df4bdc813d6100644drivers/scsi/ufs/ufs.h +1
-26@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufs.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef _UFS_Hdrivers/scsi/ufs/ufshcd-pci.c index renamed from drivers/scsi/ufs/ufshcd-pci.c +0
-0
8f78a8151499..f407b13883ac100644drivers/scsi/ufs/ufshcd-pci.c +1
-24@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller PCI glue driver * @@ -7,30 +8,6 @@* Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #include "ufshcd.h" drivers/scsi/ufs/ufshcd-pltfrm.c +1
-26@@ -1,36 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller Platform bus based glue driver -* -* This code is based on drivers/scsi/ufs/ufshcd-pltfrm.c * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #include <linux/platform_device.h> drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0
-0
ad4fc829cbb2..ec4f55211648100644drivers/scsi/ufs/ufshcd.c +1
-29@@ -1,40 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller driver Core -* -* This code is based on drivers/scsi/ufs/ufshcd.c * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. -* -* The Linux Foundation chooses to take subject only to the GPLv2 -* license terms, and distributes only under these terms. */ #include <linux/async.h> drivers/scsi/ufs/ufshcd.h index renamed from drivers/scsi/ufs/ufshcd.h +0
-0
bf97d616e597..ef92c4a9e378100644drivers/scsi/ufs/ufshcd.h +1
-26@@ -1,37 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshcd.h * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef _UFSHCD_Hdrivers/scsi/ufs/ufshci.h index renamed from drivers/scsi/ufs/ufshci.h +0
-0
c2961d37cc1c..2c1c7a277430100644drivers/scsi/ufs/ufshci.h +1
-27@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshci.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef _UFSHCI_H --2.17.1
Re: [PATCH v3 1/2] scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
Quoted 7 lines · Tomas
Quoted 7 lines
From: Bean Huo <[email protected]>
Add SPDX GPL-2.0 to UFS driver files that specified the GPL version 2 license,
remove the full boilerplate text.
Quoted 5 lines
Quoted 1 line
Signed-off-by Bean Huo <[email protected]>LGTM.
Thanks
Tomas
Hi Tomas
would you please add your viewed or acked tag for this patch? thanks,
Bean
Quoted 302 lines
Quoted 300 lines
--- drivers/scsi/ufs/ufs.h | 27 +-------------------------- drivers/scsi/ufs/ufshcd-pci.c | 25 +------------------------ drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +-------------------------- drivers/scsi/ufs/ufshcd.c | 30 +--------------------------- -- drivers/scsi/ufs/ufshcd.h | 27 +-------------------------- drivers/scsi/ufs/ufshci.h | 27 +-------------------------- 6 files changed, 6 insertions(+), 157 deletions(-)drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0
-0
c70845d41449..7df4bdc813d6100644drivers/scsi/ufs/ufs.h +1
-20@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufs.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#ifndef
_UFS_H(quoted diff) +0
-0
b/drivers/scsi/ufs/ufshcd-pci.cindex8f78a8151499..f407b13883ac100644drivers/scsi/ufs/ufshcd-pci.c +1
-18@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller PCI glue driver * @@ -7,30 +8,6 @@* Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#include "
ufshcd.h"drivers/scsi/ufs/ufshcd-pltfrm.c +1
-0@@ -1,36 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller Platform bus based glue driver
- *
- * This code is based ondrivers/scsi/ufs/ufshcd-pltfrm.c
* Copyright (C) 2011-2013 Samsung India Software Operations *
* Authors:
* Santosh Yaraganavi <[email protected]>
* Vinayak Holikatti <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * See the COPYING file in the top-level directory or visit
- * <http://www.gnu.org/licenses/gpl-2.0.html>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This program is provided "AS IS" and "WITH ALL FAULTS" and
- * without warranty of any kind. You are solely responsible for
- * determining the appropriateness of using and distributing
- * the program and assume all risks associated with your exercise
- * of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#include <
linux/platform_device.h>drivers/scsi/ufs/ufshcd.c +0
-0index
ad4fc829cbb2..ec4f55211648100644drivers/scsi/ufs/ufshcd.c +1
-2@@ -1,40 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller driver Core -* -* This code is based on drivers/scsi/ufs/ufshcd.c * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Authors:
* Santosh Yaraganavi <[email protected]>
* Vinayak Holikatti <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * See the COPYING file in the top-level directory or visit
- * <http://www.gnu.org/licenses/gpl-2.0.html>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This program is provided "AS IS" and "WITH ALL FAULTS" and
- * without warranty of any kind. You are solely responsible for
- * determining the appropriateness of using and distributing
- * the program and assume all risks associated with your exercise
- * of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
- *
- * The Linux Foundation chooses to take subject only to the GPLv2
- * license terms, and distributes only under these terms. */#include <
linux/async.h>drivers/scsi/ufs/ufshcd.h +0
-0index
bf97d616e597..ef92c4a9e378100644drivers/scsi/ufs/ufshcd.h +1
-2@@ -1,37 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshcd.h * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Authors:
* Santosh Yaraganavi <[email protected]>
* Vinayak Holikatti <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * See the COPYING file in the top-level directory or visit
- * <http://www.gnu.org/licenses/gpl-2.0.html>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This program is provided "AS IS" and "WITH ALL FAULTS" and
- * without warranty of any kind. You are solely responsible for
- * determining the appropriateness of using and distributing
- * the program and assume all risks associated with your exercise
- * of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#ifndef
_UFSHCD_Hdrivers/scsi/ufs/ufshci.h +0
-0index
c2961d37cc1c..2c1c7a277430100644drivers/scsi/ufs/ufshci.h +1
-20@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshci.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#ifndef
_UFSHCI_H
--
2.17.1
Winkler, Tomas
Reviewed-byRE: [PATCH v3 1/2] scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
Quoted 13 lines
boilerplate
Quoted 9 lines · Tomas
Quoted 8 lines
From: Bean Huo <[email protected]>
Add SPDX GPL-2.0 to UFS driver files that specified the GPL version 2 license,
remove the full boilerplate text.Signed-off-by Bean Huo <[email protected]>
Quoted 8 lines
Quoted 3 lines
LGTM.
Thanks
TomasHi Tomas
would you please add your viewed or acked tag for this patch? thanks,
Quoted 287 lines
Bean
Quoted 284 lines
Quoted 282 lines
--- drivers/scsi/ufs/ufs.h | 27 +-------------------------- drivers/scsi/ufs/ufshcd-pci.c | 25 +------------------------ drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +-------------------------- drivers/scsi/ufs/ufshcd.c | 30 +--------------------------- -- drivers/scsi/ufs/ufshcd.h | 27 +-------------------------- drivers/scsi/ufs/ufshci.h | 27 +-------------------------- 6 files changed, 6 insertions(+), 157 deletions(-)drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0
-0
c70845d41449..7df4bdc813d6100644drivers/scsi/ufs/ufs.h +1
-26@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufs.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef
_UFS_H(quoted diff) +0
-0
b/drivers/scsi/ufs/ufshcd-pci.cindex8f78a8151499..f407b13883ac100644drivers/scsi/ufs/ufshcd-pci.c +1
-24@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller PCI glue driver * @@ -7,30 +8,6 @@* Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #include "
ufshcd.h"drivers/scsi/ufs/ufshcd-pltfrm.c +1
-0@@ -1,36 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller Platform bus based glue driver
- *
- * This code is based ondrivers/scsi/ufs/ufshcd-pltfrm.c
* Copyright (C) 2011-2013 Samsung India Software Operations *
* Authors:
* Santosh Yaraganavi <[email protected]>
* Vinayak Holikatti <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * See the COPYING file in the top-level directory or visit
- * <http://www.gnu.org/licenses/gpl-2.0.html>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This program is provided "AS IS" and "WITH ALL FAULTS" and
- * without warranty of any kind. You are solely responsible for
- * determining the appropriateness of using and distributing
- * the program and assume all risks associated with your exercise
- * of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#include <
linux/platform_device.h>drivers/scsi/ufs/ufshcd.c +0
-0index
ad4fc829cbb2..ec4f55211648100644drivers/scsi/ufs/ufshcd.c +1
-2@@ -1,40 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Universal Flash Storage Host controller driver Core -* -* This code is based on drivers/scsi/ufs/ufshcd.c * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Authors:
* Santosh Yaraganavi <[email protected]>
* Vinayak Holikatti <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * See the COPYING file in the top-level directory or visit
- * <http://www.gnu.org/licenses/gpl-2.0.html>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This program is provided "AS IS" and "WITH ALL FAULTS" and
- * without warranty of any kind. You are solely responsible for
- * determining the appropriateness of using and distributing
- * the program and assume all risks associated with your exercise
- * of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
- *
- * The Linux Foundation chooses to take subject only to the GPLv2
- * license terms, and distributes only under these terms. */#include <
linux/async.h>drivers/scsi/ufs/ufshcd.h +0
-0index
bf97d616e597..ef92c4a9e378100644drivers/scsi/ufs/ufshcd.h +1
-2@@ -1,37 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshcd.h * Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Authors:
* Santosh Yaraganavi <[email protected]>
* Vinayak Holikatti <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * See the COPYING file in the top-level directory or visit
- * <http://www.gnu.org/licenses/gpl-2.0.html>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This program is provided "AS IS" and "WITH ALL FAULTS" and
- * without warranty of any kind. You are solely responsible for
- * determining the appropriateness of using and distributing
- * the program and assume all risks associated with your exercise
- * of rights with respect to the program, including but not limited
- * to infringement of third party rights, the risks and costs of
- * program errors, damage to or loss of data, programs or equipment,
- * and unavailability or interruption of operations. Under no
- * circumstances will the contributor of this Program be liable for
- * any damages of any kind arising from your use or distribution of
- * this program.
*/#ifndef
_UFSHCD_Hdrivers/scsi/ufs/ufshci.h +0
-0index
c2961d37cc1c..2c1c7a277430100644drivers/scsi/ufs/ufshci.h +1
-26@@ -1,36 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Universal Flash Storage Host controller driver -* -* This code is based on drivers/scsi/ufs/ufshci.h * Copyright (C) 2011-2013 Samsung India Software Operations * * Authors: * Santosh Yaraganavi <[email protected]> * Vinayak Holikatti <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* See the COPYING file in the top-level directory or visit -* <http://www.gnu.org/licenses/gpl-2.0.html> -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* This program is provided "AS IS" and "WITH ALL FAULTS" and -* without warranty of any kind. You are solely responsible for -* determining the appropriateness of using and distributing -* the program and assume all risks associated with your exercise -* of rights with respect to the program, including but not limited -* to infringement of third party rights, the risks and costs of -* program errors, damage to or loss of data, programs or equipment, -* and unavailability or interruption of operations. Under no -* circumstances will the contributor of this Program be liable for -* any damages of any kind arising from your use or distribution of -* this program. */ #ifndef
_UFSHCI_H
--
2.17.1
RE: [PATCH v3 1/2] scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
In reply to Bean HuoHi Bean
Quoted 9 lines
-----Original Message-----
From: Bean Huo <[email protected]>
Sent: 06 June 2020 01:35
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]
Subject: [PATCH v3 1/2] scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2
boilerplate
Quoted 4 lines
From: Bean Huo <[email protected]>
Add SPDX GPL-2.0 to UFS driver files that specified the GPL version 2
license,
Quoted 12 lines
remove the full boilerplate text.
Signed-off-by Bean Huo <[email protected]>--- drivers/scsi/ufs/ufs.h | 27 +-------------------------- drivers/scsi/ufs/ufshcd-pci.c | 25 +------------------------ drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +-------------------------- drivers/scsi/ufs/ufshcd.c | 30 +----------------------------- drivers/scsi/ufs/ufshcd.h | 27 +-------------------------- drivers/scsi/ufs/ufshci.h | 27 +-------------------------- 6 files changed, 6 insertions(+), 157 deletions(-)
Quoted 2 lines
--
2.17.1
PATCH v3 2/2 scsi: ufs: remove wrapper function ufshcd_setup_clocks()
In reply to Bean HuoFrom: Bean Huo <[email protected]>
The static function ufshcd_setup_clocks() is just a wrapper around __ufshcd_setup_clocks(), remove it. Rename original function wrapped __ufshcd_setup_clocks() to new ufshcd_setup_clocks().
--- drivers/scsi/ufs/ufshcd.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)
drivers/scsi/ufs/ufshcd.c +12 -20
@@ -215,9 +215,7 @@ static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd);static int ufshcd_clear_tm_cmd (struct ufs_hba *hba,int tag);static void ufshcd_hba_exit (struct ufs_hba *hba);static int ufshcd_probe_hba (struct ufs_hba *hba,bool async); -static int __ufshcd_setup_clocks (struct ufs_hba *hba,bool on, -bool skip_ref_clk); -static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on); +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on,bool skip_ref_clk);static int ufshcd_uic_hibern8_enter (struct ufs_hba *hba);static inline void ufshcd_add_delay_before_dme_cmd (struct ufs_hba *hba);static int ufshcd_host_reset_and_restore (struct ufs_hba *hba);
@@ -1497,7 +1495,7 @@ static void ufshcd_ungate_work(struct work_struct *work) }spin_unlock_irqrestore (hba->host->host_lock, flags); -ufshcd_setup_clocks (hba, true); +ufshcd_setup_clocks (hba, true, false);ufshcd_enable_irq (hba);
@@ -1655,10 +1653,10 @@ static void ufshcd_gate_work(struct work_struct *work)ufshcd_disable_irq (hba);if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);else /* If link is active, device ref_clk can't be switched off */ -__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false, true);/* * In case you are here to cancel this work the gating state
@@ -7683,8 +7681,7 @@ static int ufshcd_init_hba_vreg(struct ufs_hba *hba)return 0 ; } -static int __ufshcd_setup_clocks (struct ufs_hba *hba,bool on, -bool skip_ref_clk) +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on,bool skip_ref_clk) {int ret =0 ;struct ufs_clk_info *clki;
@@ -7747,11 +7744,6 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,return ret; } -static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on) -{ -return __ufshcd_setup_clocks (hba, on, false); -} -static int ufshcd_init_clocks (struct ufs_hba *hba) {int ret =0 ;
@@ -7858,7 +7850,7 @@ static int ufshcd_hba_init(struct ufs_hba *hba)if (err) goto out_disable_hba_vreg; - err =ufshcd_setup_clocks (hba, true); + err =ufshcd_setup_clocks (hba, true, false);if (err) goto out_disable_hba_vreg;
@@ -7880,7 +7872,7 @@ static int ufshcd_hba_init(struct ufs_hba *hba) out_disable_vreg:ufshcd_setup_vreg (hba, false); out_disable_clks: -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false); out_disable_hba_vreg:ufshcd_setup_hba_vreg (hba, false); out:
@@ -7896,7 +7888,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)if (ufshcd_is_clkscaling_supported (hba))if (hba->devfreq)ufshcd_suspend_clkscaling (hba); -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);ufshcd_setup_hba_vreg (hba, false); hba->is_powered = false;ufs_put_device_desc (hba);
@@ -8259,10 +8251,10 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_irq (hba);if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);else /* If link is active, device ref_clk can't be switched off */ -__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false, true); hba->clk_gating.state =CLKS_OFF ;trace_ufshcd_clk_gating (dev_name (hba->dev), hba->clk_gating.state);
@@ -8321,7 +8313,7 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_hba_vreg_set_hpm (hba);/* Make sure clocks are enabled before accessing controller */ - ret =ufshcd_setup_clocks (hba, true); + ret =ufshcd_setup_clocks (hba, true, false);if (ret) goto out;
@@ -8404,7 +8396,7 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_irq (hba);if (hba->clk_scaling.is_allowed)ufshcd_suspend_clkscaling (hba); -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false); out: hba->pm_op_in_progress =0 ;if (ret)
Signature · 1 line
2.17.1
RE: [PATCH v3 2/2] scsi: ufs: remove wrapper function ufshcd_setup_clocks()
Quoted 7 lines
From: Bean Huo <[email protected]>
The static function
ufshcd_setup_clocks()is just a wrapper around__ufshcd_setup_clocks(), remove it. Rename original function wrapped__ufshcd_setup_clocks()to newufshcd_setup_clocks().
Not sure about this change, we have only one call with skip_ref_clock set to true, the original code actually make sense from readability stand point.
Quoted 130 lines
Signed-off-by Bean Huo <[email protected]>--- drivers/scsi/ufs/ufshcd.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0
-0
ec4f55211648..531d0b7878db100644drivers/scsi/ufs/ufshcd.c +0
-0@@ -215,9 +215,7 @@ static int ufshcd_eh_host_reset_handler(struct
scsi_cmnd*cmd); static intufshcd_clear_tm_cmd(struct ufs_hba *hba, int tag); static voidufshcd_hba_exit(struct ufs_hba *hba); static intufshcd_probe_hba(struct ufs_hba *hba, bool async); -static int __ufshcd_setup_clocks(structufs_hba*hba, bool on,drivers/scsi/ufs/ufshcd.c +2
-2- bool skip_ref_clk); -static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on); +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on,bool +skip_ref_clk); static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba); static inline void
ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba); static intufshcd_host_reset_and_restore(struct ufs_hba *hba); @@ -1497,7 +1495,7 @@ static voidufshcd_ungate_work(struct work_struct *work)drivers/scsi/ufs/ufshcd.c +3
-3}spin_unlock_irqrestore (hba->host->host_lock, flags); -ufshcd_setup_clocks (hba, true); +ufshcd_setup_clocks (hba, true, false);ufshcd_enable_irq (hba);@@ -1655,10 +1653,10 @@ static void ufshcd_gate_work(struct work_struct *work)ufshcd_disable_irq (hba);if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);else /* If link is active, device ref_clk can't be switched off */ -__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false, true);/* * In case you are here to cancel this work the gating state @@ -
7683,8 +7681,7 @@ static intufshcd_init_hba_vreg(struct ufs_hba *hba)drivers/scsi/ufs/ufshcd.c +7
-11return 0 ; } -static int __ufshcd_setup_clocks (struct ufs_hba *hba,bool on, -bool skip_ref_clk) +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on,bool +skip_ref_clk) {int ret =0 ;struct ufs_clk_info *clki;@@ -7747,11 +7744,6 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, return ret; } -static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on) -{ -return __ufshcd_setup_clocks (hba, on, false); -} -static int ufshcd_init_clocks (struct ufs_hba *hba) {int ret =0 ;@@ -7858,7 +7850,7 @@ static int ufshcd_hba_init(struct ufs_hba *hba)if (err) goto out_disable_hba_vreg; - err =ufshcd_setup_clocks (hba, true); + err =ufshcd_setup_clocks (hba, true, false);if (err) goto out_disable_hba_vreg;@@ -7880,7 +7872,7 @@ static int ufshcd_hba_init(struct ufs_hba *hba) out_disable_vreg:ufshcd_setup_vreg (hba, false); out_disable_clks: -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false); out_disable_hba_vreg:ufshcd_setup_hba_vreg (hba, false); out:@@ -7896,7 +7888,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)if (ufshcd_is_clkscaling_supported (hba))if (hba->devfreq)ufshcd_suspend_clkscaling (hba); -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);ufshcd_setup_hba_vreg (hba, false); hba->is_powered = false;ufs_put_device_desc (hba);@@ -8259,10 +8251,10 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_irq (hba );if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);else /* If link is active, device ref_clk can't be switched off */ -__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false, true); hba->clk_gating.state =CLKS_OFF ;trace_ufshcd_clk_gating(dev_name(hba->dev), hba-
Quoted 1 line
clk_gating.state); @@ -8321,7 +8313,7 @@ static int ufshcd_resume(struct
ufs_hba*hba, enumufs_pm_oppm_op)drivers/scsi/ufs/ufshcd.c +2
-2ufshcd_hba_vreg_set_hpm (hba);/* Make sure clocks are enabled before accessing controller */ - ret =ufshcd_setup_clocks (hba, true); + ret =ufshcd_setup_clocks (hba, true, false);if (ret) goto out;@@ -8404,7 +8396,7 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_irq (hba );if (hba->clk_scaling.is_allowed)ufshcd_suspend_clkscaling (hba); -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false); out: hba->pm_op_in_progress =0 ;if (ret)
--
2.17.1
RE: [PATCH v3 2/2] scsi: ufs: remove wrapper function ufshcd_setup_clocks()
Hi Bean,
Quoted 14 lines
-----Original Message-----
From: Winkler, Tomas <[email protected]>
Sent: 07 June 2020 04:58
To: Bean Huo <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]
Subject: RE: [PATCH v3 2/2] scsi: ufs: remove wrapper functionufshcd_setup_clocks()Quoted 1 line
Quoted 7 lines
Quoted 5 lines
From: Bean Huo <[email protected]>
The static function
ufshcd_setup_clocks()is just a wrapper around__ufshcd_setup_clocks(), remove it. Rename original function wrapped__ufshcd_setup_clocks()to newufshcd_setup_clocks().Not sure about this change, we have only one call with
skip_ref_clockset
to
Quoted 2 lines
true, the original code actually make sense from readability stand point.
I do agree with Tomas, it easy to read and understand the original code. Thanks
Quoted 37 lines
Quoted 20 lines
Signed-off-by Bean Huo <[email protected]>--- drivers/scsi/ufs/ufshcd.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)drivers/scsi/ufs/ufshcd.c +0
-0@@ -215,9 +215,7 @@ static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd); static int ufshcd_clear_tm_cmd(struct ufs_hba *hba,int tag); static void
ufshcd_hba_exit(struct ufs_hba *hba); static intufshcd_probe_hba(struct ufs_hba *hba, bool async); -static int __ufshcd_setup_clocks(structufs_hba*hba, bool on,drivers/scsi/ufs/ufshcd.c +2
-2- bool skip_ref_clk); -static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on); +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on,bool +skip_ref_clk); static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba); staticQuoted 3 lines
inline void
ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba); static intufshcd_host_reset_and_restore(struct ufs_hba *hba); @@ -1497,7 +1495,7 @@ static void ufshcd_ungate_work(structwork_struct*work)
Quoted 13 lines
drivers/scsi/ufs/ufshcd.c +1
-1}spin_unlock_irqrestore (hba->host->host_lock, flags); -ufshcd_setup_clocks (hba, true); +ufshcd_setup_clocks (hba, true, false);ufshcd_enable_irq (hba);@@ -1655,10 +1653,10 @@ static void ufshcd_gate_work(struct
work_struct
*work)
ufshcd_disable_irq(hba);
Quoted 5 lines
drivers/scsi/ufs/ufshcd.c static void ufshcd_gate_work(struct work_struct *work)
Quoted 5 lines
drivers/scsi/ufs/ufshcd.c +1
-1if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);else /* If link is active, device ref_clk can't be switched off
*/
Quoted 58 lines
Quoted 58 lines
drivers/scsi/ufs/ufshcd.c +1
-1-__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false, true);/* * In case you are here to cancel this work the gating state @@ - 7683,8 +7681,7 @@ static int
ufshcd_init_hba_vreg(struct ufs_hba *hba)drivers/scsi/ufs/ufshcd.c +5
-9return 0 ; } -static int __ufshcd_setup_clocks (struct ufs_hba *hba,bool on, -bool skip_ref_clk) +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on,bool +skip_ref_clk) {int ret =0 ;struct ufs_clk_info *clki;@@ -7747,11 +7744,6 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, return ret; } -static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on) -{ -return __ufshcd_setup_clocks (hba, on, false); -} -static int ufshcd_init_clocks (struct ufs_hba *hba) {int ret =0 ;@@ -7858,7 +7850,7 @@ static int ufshcd_hba_init(struct ufs_hba *hba)if (err) goto out_disable_hba_vreg; - err =ufshcd_setup_clocks (hba, true); + err =ufshcd_setup_clocks (hba, true, false);if (err) goto out_disable_hba_vreg;@@ -7880,7 +7872,7 @@ static int ufshcd_hba_init(struct ufs_hba *hba) out_disable_vreg:ufshcd_setup_vreg (hba, false); out_disable_clks: -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false); out_disable_hba_vreg:ufshcd_setup_hba_vreg (hba, false); out:@@ -7896,7 +7888,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)if (ufshcd_is_clkscaling_supported (hba))if (hba->devfreq)ufshcd_suspend_clkscaling (hba); -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);ufshcd_setup_hba_vreg (hba, false); hba->is_powered = false;ufs_put_device_desc (hba);@@ -8259,10 +8251,10 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_irq (hba );
Quoted 5 lines
drivers/scsi/ufs/ufshcd.c static void ufshcd_gate_work(struct work_struct *work)
Quoted 5 lines
drivers/scsi/ufs/ufshcd.c +1
-1if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false);else /* If link is active, device ref_clk can't be switched off
*/
Quoted 28 lines
Quoted 28 lines
drivers/scsi/ufs/ufshcd.c +1
-1-__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false, true); hba->clk_gating.state =CLKS_OFF ;trace_ufshcd_clk_gating(dev_name(hba->dev), hba-
Quoted 2 lines
clk_gating.state); @@ -8321,7 +8313,7 @@ static int ufshcd_resume(struct
ufs_hba*hba, enumufs_pm_oppm_op)drivers/scsi/ufs/ufshcd.c +2
-2ufshcd_hba_vreg_set_hpm (hba);/* Make sure clocks are enabled before accessing controller */ - ret =ufshcd_setup_clocks (hba, true); + ret =ufshcd_setup_clocks (hba, true, false);if (ret) goto out;@@ -8404,7 +8396,7 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_irq (hba );if (hba->clk_scaling.is_allowed)ufshcd_suspend_clkscaling (hba); -ufshcd_setup_clocks (hba, false); +ufshcd_setup_clocks (hba, false, false); out: hba->pm_op_in_progress =0 ;if (ret)
--
2.17.1
Martin K. Petersen
AppliedQuoted 11 lines · Bean Huo
Cleanup, no functional change
Changelog:
v2 -v3:
1. Change SPDX-License-Identifier: GPL-2.0 to
SPDX-License-Identifier: GPL-2.0-or-later (Eric Biggers)
v1 - v2:
1. Split patch (Tomas Winkler)[...]
Applied to 5.9/scsi-queue, thanks!
[1/2] scsi: ufs: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
https://git.kernel.org/mkp/scsi/c/673511199ac9
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering