From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758914AbbLBQVQ (ORCPT ); Wed, 2 Dec 2015 11:21:16 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37199 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758898AbbLBQVO (ORCPT ); Wed, 2 Dec 2015 11:21:14 -0500 From: Thierry Reding To: Russell King Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/armada: Use platform_register/unregister_drivers() Date: Wed, 2 Dec 2015 17:21:12 +0100 Message-Id: <1449073272-11165-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thierry Reding These new helpers simplify implementing multi-driver modules and properly handle failure to register one driver by unregistering all previously registered drivers. Signed-off-by: Thierry Reding --- drivers/gpu/drm/armada/armada_drv.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 77ab93d60125..e7e50fccc174 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -333,26 +333,22 @@ static struct platform_driver armada_drm_platform_driver = { .id_table = armada_drm_platform_ids, }; +static struct platform_driver * const drivers[] = { + &armada_lcd_platform_driver, + &armada_drm_platform_driver, +}; + static int __init armada_drm_init(void) { - int ret; - armada_drm_driver.num_ioctls = ARRAY_SIZE(armada_ioctls); - ret = platform_driver_register(&armada_lcd_platform_driver); - if (ret) - return ret; - ret = platform_driver_register(&armada_drm_platform_driver); - if (ret) - platform_driver_unregister(&armada_lcd_platform_driver); - return ret; + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } module_init(armada_drm_init); static void __exit armada_drm_exit(void) { - platform_driver_unregister(&armada_drm_platform_driver); - platform_driver_unregister(&armada_lcd_platform_driver); + platform_unregister_drivers(drivers, ARRAY_SIZE(drivers)); } module_exit(armada_drm_exit); -- 2.5.0