Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-input@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 2/8] Input: amikbd - convert to use devm_* api
Date:   Fri, 14 Jul 2023 16:06:05 +0800
Message-Id: <20230714080611.81302-2-frank.li@vivo.com>
In-Reply-To: <20230714080611.81302-1-frank.li@vivo.com>
References: <20230714080611.81302-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LG0lOUObEqqCCbaiDyV2wUzV46gO2O7YsbsZ6repDziWQt9s+sMMQNin0P1e?=
 =?us-ascii?Q?6YsDxMKrFIWT21WzJBVf9JU/o+qWDWA7qpxkB32PfTmD5yMbyonwI6JTK9jo?=
 =?us-ascii?Q?y/k10dwtGniWB9+XYGL6S171UdJ++pz+IH9o05fMtYfhVGm4HmHbKw1eT3eb?=
 =?us-ascii?Q?4lGUQweHhXJR1JPY9tPxzz1TrCrwk4IZHXe5Qs8xrb6sSlwnKj8FbIsxb0yi?=
 =?us-ascii?Q?kcQQa+HtPSNnmbx7ztXukDCqvuE+HkxUa8oKoA1TuZ0k962dk/NhmcpWhXqp?=
 =?us-ascii?Q?6/TrRY2ZcppFfXLZfB+Ig2DQCbWuOkSSrCJa3cRRrhhiDs6jvZ+9loLaJI0Y?=
 =?us-ascii?Q?ldjRx4JarZUqODmL7s9YW5Pe7oeB/+k1JYpGr0dQOdlKDVSXGDY3QNGR4JCW?=
 =?us-ascii?Q?f9ImgDbNxfye3Xlb+DCmb3P6GgDE7/FsdUTbVh/6l0qLLzFe8otLuB459v7k?=
 =?us-ascii?Q?jJhb1uSdn1DaoGh+ob3flhocL0tJdYGQiRjzentf5kOAgaoCsvsnSjwndeNK?=
 =?us-ascii?Q?EdfXT8MCv7VyYd5BkSgxYEf2xGB67AO95qOu2VPELXWlp9W3/65gxQreVuh6?=
 =?us-ascii?Q?AO7B5Du3RJ/u8AuiQxbH8SZKUbiFCwVLiwOGXUbXQ1WAQpIKSBKedRN1C+aC?=
 =?us-ascii?Q?1wyb6UH9FGJB+PsKfM0vSM8u9kDkUP1Iz2RCB07l/PafzjbgNDPJTLNS+dJr?=
 =?us-ascii?Q?E/lHf3L4ESeqs8iE0ssaD6uQk1owiJ7VWihAxftVkVZOwthOwNb16ClL2aCO?=
 =?us-ascii?Q?PcJ7rgc7EBtgwED3c8DQ+E1UEnDGPwTJwNLGyiIeataq3RxaD0/79eolvul/?=
 =?us-ascii?Q?q3fw5W9zber8XCflUtr/wj7cUKfHRZRIlk3/sJ7tcQ6qhNKdnTcEkQArZVdI?=
 =?us-ascii?Q?odXS2W7buw7W/onb0N7CDs/09pJHlZVJOXr2/BGkb9Z+IFTDXEcGISm4h6TO?=
 =?us-ascii?Q?+ZU9lxp9PkWZLNDOhszeMds3YWGGjuXTbAh0vZzTyzhDZwJkeIgEa6RUiqM4?=
 =?us-ascii?Q?b+Kja7W9Xp8J8ySbh8d5/HYqCyPz9PAsSHLXZdD/0J6orgCRc7OhQVNZ3e0m?=
 =?us-ascii?Q?z4RRHr/QYvz74shtMK1YEEVweK4L18Zwg4HO6lqNb84JF2nePVvEw0Mb4BTy?=
 =?us-ascii?Q?VxS5nKyS5E6Pem1cy/oq/1D9dLJTIbAI4BtpXdBcm9xao2i2nHc9xk5lU0Fe?=
 =?us-ascii?Q?KKOwdJBbzgK0iVc3NauopqB8K4WpbHHmffarD8UFXxKeCQrFUe7gSOj8U1K2?=
 =?us-ascii?Q?2rYpP7hJne13GuT2AGd10HRx+uK7Gp/415MqQu1Cg4zvtczAgJNhibdoJFfl?=
 =?us-ascii?Q?c8VNAukEwrteSERtb2IpiylSuHyYOXOTxFjgPmSHP0/Xle9V7DkPsC0/S/kg?=
 =?us-ascii?Q?5s+MqVQ2fyEVykItNvJIuKSQCAoxe3I7nZvPp3B77UTG0YtWhSYsDYJtSCDL?=
 =?us-ascii?Q?4aSCa5EYvp2agvJcS23g8L9L3qhw7Xh/l4uwpF4mVyA9o3ebBBIOj1RJosfn?=
 =?us-ascii?Q?FZXeUCUaPeQa0BKYbaPQAMS/sFgZc8c+2ReJLoyKeR5+fmGX8OiOLImrpJjs?=
 =?us-ascii?Q?QZA0a25nyJTJs5OyaC3AoB93UC+CLlvyJeW3KcTg?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b0c8d827-20cd-43fc-0baa-08db844136c2
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 08:06:23.1144
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lhCSSl42C1vjAJwMYssLwLBWAlUveXqoKvApjp52M1d06zalQMyFmSZghHCb6vOpVuK7mxzWSRx7USGGu0Vl6Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6058
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use devm_* api to simplify code, this makes it unnecessary to explicitly
release resources.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/input/keyboard/amikbd.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index a20a4e186639..4cbac79f5a4b 100644
--- a/drivers/input/keyboard/amikbd.c
+++ b/drivers/input/keyboard/amikbd.c
@@ -193,10 +193,11 @@ static irqreturn_t amikbd_interrupt(int irq, void *data)
 
 static int __init amikbd_probe(struct platform_device *pdev)
 {
+	struct device *device = &pdev->dev;
 	struct input_dev *dev;
 	int i, err;
 
-	dev = input_allocate_device();
+	dev = devm_input_allocate_device(device);
 	if (!dev) {
 		dev_err(&pdev->dev, "Not enough memory for input device\n");
 		return -ENOMEM;
@@ -218,35 +219,21 @@ static int __init amikbd_probe(struct platform_device *pdev)
 	amikbd_init_console_keymaps();
 
 	ciaa.cra &= ~0x41;	 /* serial data in, turn off TA */
-	err = request_irq(IRQ_AMIGA_CIAA_SP, amikbd_interrupt, 0, "amikbd",
-			  dev);
+	err = devm_request_irq(device, IRQ_AMIGA_CIAA_SP, amikbd_interrupt, 0, "amikbd",
+			       dev);
 	if (err)
-		goto fail2;
+		return err;
 
 	err = input_register_device(dev);
 	if (err)
-		goto fail3;
+		return err;
 
 	platform_set_drvdata(pdev, dev);
 
 	return 0;
-
- fail3:	free_irq(IRQ_AMIGA_CIAA_SP, dev);
- fail2:	input_free_device(dev);
-	return err;
-}
-
-static int __exit amikbd_remove(struct platform_device *pdev)
-{
-	struct input_dev *dev = platform_get_drvdata(pdev);
-
-	free_irq(IRQ_AMIGA_CIAA_SP, dev);
-	input_unregister_device(dev);
-	return 0;
 }
 
 static struct platform_driver amikbd_driver = {
-	.remove = __exit_p(amikbd_remove),
 	.driver   = {
 		.name	= "amiga-keyboard",
 	},
-- 
2.39.0