From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753494AbcDCVY5 (ORCPT ); Sun, 3 Apr 2016 17:24:57 -0400 Received: from mail1.windriver.com ([147.11.146.13]:52453 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbcDCVYv (ORCPT ); Sun, 3 Apr 2016 17:24:51 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Chanwoo Choi , Krzysztof Kozlowski , Samuel Ortiz , Lee Jones Subject: [PATCH 6/7] drivers/mfd: make max77693.c explicitly non-modular Date: Sun, 3 Apr 2016 17:24:18 -0400 Message-ID: <1459718659-28316-7-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1459718659-28316-1-git-send-email-paul.gortmaker@windriver.com> References: <1459718659-28316-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_MAX77693 drivers/mfd/Kconfig: bool "Maxim Semiconductor MAX77693 PMIC Support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_init was not in use by this code, the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was contained at the top of the file in the comments. Cc: Chanwoo Choi Cc: Krzysztof Kozlowski Cc: Samuel Ortiz Cc: Lee Jones Signed-off-by: Paul Gortmaker --- drivers/mfd/max77693.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c index b83b7a7da1ae..4126a55269d2 100644 --- a/drivers/mfd/max77693.c +++ b/drivers/mfd/max77693.c @@ -2,7 +2,7 @@ * max77693.c - mfd core driver for the MAX 77693 * * Copyright (C) 2012 Samsung Electronics - * SangYoung Son + * SangYoung Son * * This program is not provided / owned by Maxim Integrated Products. * @@ -23,7 +23,7 @@ * This driver is based on max8997.c */ -#include +#include #include #include #include @@ -309,28 +309,10 @@ err_i2c_haptic: return ret; } -static int max77693_i2c_remove(struct i2c_client *i2c) -{ - struct max77693_dev *max77693 = i2c_get_clientdata(i2c); - - mfd_remove_devices(max77693->dev); - - regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic); - regmap_del_irq_chip(max77693->irq, max77693->irq_data_chg); - regmap_del_irq_chip(max77693->irq, max77693->irq_data_topsys); - regmap_del_irq_chip(max77693->irq, max77693->irq_data_led); - - i2c_unregister_device(max77693->i2c_muic); - i2c_unregister_device(max77693->i2c_haptic); - - return 0; -} - static const struct i2c_device_id max77693_i2c_id[] = { { "max77693", TYPE_MAX77693 }, { } }; -MODULE_DEVICE_TABLE(i2c, max77693_i2c_id); static int max77693_suspend(struct device *dev) { @@ -374,10 +356,10 @@ static struct i2c_driver max77693_i2c_driver = { .driver = { .name = "max77693", .pm = &max77693_pm, + .suppress_bind_attrs = true, .of_match_table = of_match_ptr(max77693_dt_match), }, .probe = max77693_i2c_probe, - .remove = max77693_i2c_remove, .id_table = max77693_i2c_id, }; @@ -387,13 +369,3 @@ static int __init max77693_i2c_init(void) } /* init early so consumer devices can complete system boot */ subsys_initcall(max77693_i2c_init); - -static void __exit max77693_i2c_exit(void) -{ - i2c_del_driver(&max77693_i2c_driver); -} -module_exit(max77693_i2c_exit); - -MODULE_DESCRIPTION("MAXIM 77693 multi-function core driver"); -MODULE_AUTHOR("SangYoung, Son "); -MODULE_LICENSE("GPL"); -- 2.8.0