Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751233AbbEAWJX (ORCPT ); Fri, 1 May 2015 18:09:23 -0400 Received: from mail.savoirfairelinux.com ([209.172.62.77]:53445 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbbEAWJW (ORCPT ); Fri, 1 May 2015 18:09:22 -0400 From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Vivien Didelot , "David S. Miller" , Florian Fainelli , Guenter Roeck , Andrew Lunn , kernel@savoirfairelinux.com Subject: [PATCH 1/3] net: dsa: introduce module_switch_driver macro Date: Fri, 1 May 2015 18:09:13 -0400 Message-Id: <1430518155-29565-1-git-send-email-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.3.7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2444 Lines: 72 This commit introduces a new module_switch_driver macro, similar to module_platform_driver and such, to reduce boilerplate when declaring DSA switch drivers. In order to use the module_driver macro, register_switch_driver needed to be changed to return an int instead of void, so make it return 0. Signed-off-by: Vivien Didelot --- include/net/dsa.h | 13 ++++++++++++- net/dsa/dsa.c | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/net/dsa.h b/include/net/dsa.h index fbca63b..927f16a 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -11,6 +11,7 @@ #ifndef __LINUX_NET_DSA_H #define __LINUX_NET_DSA_H +#include #include #include #include @@ -304,8 +305,18 @@ struct dsa_switch_driver { unsigned char *addr, bool *is_static); }; -void register_switch_driver(struct dsa_switch_driver *type); +int register_switch_driver(struct dsa_switch_driver *type); void unregister_switch_driver(struct dsa_switch_driver *type); + +/* module_switch_driver() - Helper macro for drivers that don't do anything + * special in module init/exit. This eliminates a lot of boilerplate. Each + * module may only use this macro once, and calling it replaces module_init() + * and module_exit() + */ +#define module_switch_driver(__switch_driver) \ + module_driver(__switch_driver, register_switch_driver, \ + unregister_switch_driver) + struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev); static inline void *ds_to_priv(struct dsa_switch *ds) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index e6f6cc3..9630522 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -31,11 +31,13 @@ char dsa_driver_version[] = "0.1"; static DEFINE_MUTEX(dsa_switch_drivers_mutex); static LIST_HEAD(dsa_switch_drivers); -void register_switch_driver(struct dsa_switch_driver *drv) +int register_switch_driver(struct dsa_switch_driver *drv) { mutex_lock(&dsa_switch_drivers_mutex); list_add_tail(&drv->list, &dsa_switch_drivers); mutex_unlock(&dsa_switch_drivers_mutex); + + return 0; } EXPORT_SYMBOL_GPL(register_switch_driver); -- 2.3.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/