driver core: device.h: remove extern from function prototypes
Greg Kroah-Hartman
maintainerPATCH 1/6 driver core: device.h: remove extern from function prototypes
The kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from include/linux/device.h as they are not needed.
--- include/linux/device.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/device.h +1 -2
@@ -1088,8 +1088,7 @@ void device_link_remove(void *consumer, struct device *supplier);void device_links_supplier_sync_state_pause (void );void device_links_supplier_sync_state_resume (void ); -extern __printf(3, 4) -int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); +__printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...);/* Create alias, so I can be autoloaded. */ #define MODULE_ALIAS_CHARDEV (major,minor) \
Signature · 1 line
2.40.0
Greg Kroah-Hartman
maintainerPATCH 2/6 driver core: bus.h: remove extern from function prototypes
The kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from include/linux/device/bus.h as they are not needed.
--- include/linux/device/bus.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
include/linux/device/bus.h +6 -8
@@ -109,11 +109,11 @@ struct bus_type {bool need_parent_lock; }; -extern int __must_check bus_register (const struct bus_type *bus); +int __must_check bus_register (const struct bus_type *bus); -extern void bus_unregister (const struct bus_type *bus); +void bus_unregister (const struct bus_type *bus); -extern int __must_check bus_rescan_devices (const struct bus_type *bus); +int __must_check bus_rescan_devices (const struct bus_type *bus);struct bus_attribute {struct attribute attr;
@@ -243,10 +243,8 @@ void bus_sort_breadthfirst(struct bus_type *bus,*/ struct notifier_block ; -extern int bus_register_notifier (const struct bus_type *bus, -struct notifier_block *nb); -extern int bus_unregister_notifier (const struct bus_type *bus, -struct notifier_block *nb); +int bus_register_notifier (const struct bus_type *bus,struct notifier_block *nb); +int bus_unregister_notifier (const struct bus_type *bus,struct notifier_block *nb);/** * enum bus_notifier_event - Bus Notifier events that have happened
@@ -278,7 +276,7 @@ enum bus_notifier_event { BUS_NOTIFY_DRIVER_NOT_BOUND, }; -extern struct kset *bus_get_kset (const struct bus_type *bus); +struct kset *bus_get_kset (const struct bus_type *bus);struct device *bus_get_dev_root (const struct bus_type *bus);#endif
Signature · 1 line
2.40.0
Greg Kroah-Hartman
maintainerPATCH 3/6 driver core: driver.h: remove extern from function prototypes
In reply to Greg Kroah-HartmanThe kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from include/linux/device/driver.h as they are not needed.
--- include/linux/device/driver.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
include/linux/device/driver.h +11 -15
@@ -122,13 +122,12 @@ struct device_driver { }; -extern int __must_check driver_register (struct device_driver *drv); -extern void driver_unregister (struct device_driver *drv); +int __must_check driver_register (struct device_driver *drv); +void driver_unregister (struct device_driver *drv); -extern struct device_driver *driver_find (const char *name, -const struct bus_type *bus); -extern int driver_probe_done (void ); -extern void wait_for_device_probe (void ); +struct device_driver *driver_find (const char *name,const struct bus_type *bus); +int driver_probe_done (void ); +void wait_for_device_probe (void );void __init wait_for_init_devices_probe (void );/* sysfs interface for exporting driver attributes */
@@ -147,18 +146,15 @@ struct driver_attribute {#define DRIVER_ATTR_WO (_name) \ struct driver_attribute driver_attr_##_name = __ATTR_WO(_name) -extern int __must_check driver_create_file (struct device_driver *driver, -const struct driver_attribute *attr); -extern void driver_remove_file (struct device_driver *driver, -const struct driver_attribute *attr); +int __must_check driver_create_file (struct device_driver *driver, +const struct driver_attribute *attr); +void driver_remove_file (struct device_driver *driver, +const struct driver_attribute *attr);int driver_set_override (struct device *dev,const char **override,const char *s,size_t len); -extern int __must_check driver_for_each_device (struct device_driver *drv, -struct device *start, -void *data, -int (*fn)(struct device *dev, -void *)); +int __must_check driver_for_each_device (struct device_driver *drv,struct device *start, +void *data,int (*fn)(struct device *dev,void *));struct device *driver_find_device (struct device_driver *drv,struct device *start,const void *data,int (*match)(struct device *dev,const void *data));
Signature · 1 line
2.40.0
Greg Kroah-Hartman
maintainerPATCH 4/6 driver core: base.h: remove extern from function prototypes
In reply to Greg Kroah-HartmanThe kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from drivers/base/base.h as they are not needed.
--- drivers/base/base.h | 88 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 46 deletions(-)
drivers/base/base.h +42 -46
@@ -125,42 +125,40 @@ struct device_private { container_of(obj, struct device_private, knode_class) /* initialisation functions */ -extern int devices_init (void ); -extern int buses_init (void ); -extern int classes_init (void ); -extern int firmware_init (void ); +int devices_init (void ); +int buses_init (void ); +int classes_init (void ); +int firmware_init (void );#ifdef CONFIG_SYS_HYPERVISOR -extern int hypervisor_init (void ); +int hypervisor_init (void );#else static inline int hypervisor_init (void ) {return 0 ; }#endif -extern int platform_bus_init (void ); -extern void cpu_dev_init (void ); -extern void container_dev_init (void ); +int platform_bus_init (void ); +void cpu_dev_init (void ); +void container_dev_init (void );#ifdef CONFIG_AUXILIARY_BUS -extern void auxiliary_bus_init (void ); +void auxiliary_bus_init (void );#else static inline void auxiliary_bus_init (void ) { }#endif struct kobject *virtual_device_parent (struct device *dev); -extern int bus_add_device (struct device *dev); -extern void bus_probe_device (struct device *dev); -extern void bus_remove_device (struct device *dev); +int bus_add_device (struct device *dev); +void bus_probe_device (struct device *dev); +void bus_remove_device (struct device *dev);void bus_notify (struct device *dev,enum bus_notifier_event value);bool bus_is_registered (const struct bus_type *bus); -extern int bus_add_driver (struct device_driver *drv); -extern void bus_remove_driver (struct device_driver *drv); -extern void device_release_driver_internal (struct device *dev, -struct device_driver *drv, -struct device *parent); +int bus_add_driver (struct device_driver *drv); +void bus_remove_driver (struct device_driver *drv); +void device_release_driver_internal (struct device *dev,struct device_driver *drv, +struct device *parent); -extern void driver_detach (struct device_driver *drv); -extern void driver_deferred_probe_del (struct device *dev); -extern void device_set_deferred_probe_reason (const struct device *dev, -struct va_format *vaf); +void driver_detach (struct device_driver *drv); +void driver_deferred_probe_del (struct device *dev); +void device_set_deferred_probe_reason (const struct device *dev,struct va_format *vaf);static inline int driver_match_device (struct device_driver *drv,struct device *dev) {
@@ -175,27 +173,25 @@ static inline void dev_sync_state(struct device *dev) dev->driver->sync_state (dev); } -extern int driver_add_groups (struct device_driver *drv, -const struct attribute_group **groups); -extern void driver_remove_groups (struct device_driver *drv, -const struct attribute_group **groups); +int driver_add_groups (struct device_driver *drv,const struct attribute_group **groups); +void driver_remove_groups (struct device_driver *drv,const struct attribute_group **groups);void device_driver_detach (struct device *dev); -extern int devres_release_all (struct device *dev); -extern void device_block_probing (void ); -extern void device_unblock_probing (void ); -extern void deferred_probe_extend_timeout (void ); -extern void driver_deferred_probe_trigger (void ); +int devres_release_all (struct device *dev); +void device_block_probing (void ); +void device_unblock_probing (void ); +void deferred_probe_extend_timeout (void ); +void driver_deferred_probe_trigger (void );const char *device_get_devnode (const struct device *dev,umode_t *mode,kuid_t *uid,kgid_t *gid,const char **tmp);/* /sys/devices directory */ extern struct kset *devices_kset; -extern void devices_kset_move_last (struct device *dev); +void devices_kset_move_last (struct device *dev);#if defined(CONFIG_MODULES ) && defined(CONFIG_SYSFS ) -extern void module_add_driver (struct module *mod,struct device_driver *drv); -extern void module_remove_driver (struct device_driver *drv); +void module_add_driver (struct module *mod,struct device_driver *drv); +void module_remove_driver (struct device_driver *drv);#else static inline void module_add_driver (struct module *mod,struct device_driver *drv) { }
@@ -203,24 +199,24 @@ static inline void module_remove_driver(struct device_driver *drv) { }#endif #ifdef CONFIG_DEVTMPFS -extern int devtmpfs_init (void ); +int devtmpfs_init (void );#else static inline int devtmpfs_init (void ) {return 0 ; }#endif /* Device links support */ -extern int device_links_read_lock (void ); -extern void device_links_read_unlock (int idx); -extern int device_links_read_lock_held (void ); -extern int device_links_check_suppliers (struct device *dev); -extern void device_links_force_bind (struct device *dev); -extern void device_links_driver_bound (struct device *dev); -extern void device_links_driver_cleanup (struct device *dev); -extern void device_links_no_driver (struct device *dev); -extern bool device_links_busy (struct device *dev); -extern void device_links_unbind_consumers (struct device *dev); -extern void fw_devlink_drivers_done (void ); -extern void fw_devlink_probing_done (void ); +int device_links_read_lock (void ); +void device_links_read_unlock (int idx); +int device_links_read_lock_held (void ); +int device_links_check_suppliers (struct device *dev); +void device_links_force_bind (struct device *dev); +void device_links_driver_bound (struct device *dev); +void device_links_driver_cleanup (struct device *dev); +void device_links_no_driver (struct device *dev); +bool device_links_busy (struct device *dev); +void device_links_unbind_consumers (struct device *dev); +void fw_devlink_drivers_done (void ); +void fw_devlink_probing_done (void );/* device pm support */ void device_pm_move_to_tail (struct device *dev);
Signature · 1 line
2.40.0
Greg Kroah-Hartman
maintainerPATCH 5/6 driver core: physical_location.h remove extern from function prototypes
In reply to Greg Kroah-HartmanThe kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from drivers/base/physical_location.h as they are not needed.
--- drivers/base/physical_location.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/physical_location.h +1 -1
@@ -8,7 +8,7 @@#include <linux/device.h> #ifdef CONFIG_ACPI -extern bool dev_add_physical_location (struct device *dev); +bool dev_add_physical_location (struct device *dev);extern const struct attribute_group dev_attr_physical_location_group;#else static inline bool dev_add_physical_location (struct device *dev) {return false; };
Signature · 1 line
2.40.0
Greg Kroah-Hartman
maintainerPATCH 6/6 kobject.h remove extern from function prototypes
In reply to Greg Kroah-HartmanThe kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from include/linux/kobject.h as they are not needed.
--- include/linux/kobject.h | 59 ++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 33 deletions(-)
include/linux/kobject.h +26 -33
@@ -79,43 +79,37 @@ struct kobject { unsigned int uevent_suppress:1; }; -extern __printf(2, 3) -int kobject_set_name(struct kobject *kobj, const char *name, ...); -extern __printf(2, 0) -int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, - va_list vargs); +__printf(2, 3) int kobject_set_name(struct kobject *kobj, const char *name, ...); +__printf(2, 0) int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, va_list vargs);static inline const char *kobject_name (const struct kobject *kobj) {return kobj->name; } -extern void kobject_init(struct kobject *kobj, const struct kobj_type *ktype); -extern __printf(3, 4) __must_check -int kobject_add(struct kobject *kobj, struct kobject *parent, - const char *fmt, ...); -extern __printf(4, 5) __must_check -int kobject_init_and_add(struct kobject *kobj, - const struct kobj_type *ktype, struct kobject *parent, - const char *fmt, ...); +void kobject_init (struct kobject *kobj,const struct kobj_type *ktype); +__printf(3, 4) __must_check int kobject_add(struct kobject *kobj, +struct kobject *parent, +const char *fmt, ...); +__printf(4, 5) __must_check int kobject_init_and_add(struct kobject *kobj, +const struct kobj_type *ktype, +struct kobject *parent, +const char *fmt, ...); -extern void kobject_del(struct kobject *kobj); +void kobject_del (struct kobject *kobj); -extern struct kobject * __must_check kobject_create_and_add(const char *name, - struct kobject *parent); +struct kobject *__must_check kobject_create_and_add (const char *name,struct kobject *parent); -extern int __must_check kobject_rename(struct kobject *, const char *new_name); -extern int __must_check kobject_move(struct kobject *, struct kobject *); +int __must_check kobject_rename (struct kobject *,const char *new_name); +int __must_check kobject_move (struct kobject *,struct kobject *); -extern struct kobject *kobject_get(struct kobject *kobj); -extern struct kobject * __must_check kobject_get_unless_zero( - struct kobject *kobj); -extern void kobject_put(struct kobject *kobj); +struct kobject *kobject_get (struct kobject *kobj); +struct kobject *__must_check kobject_get_unless_zero (struct kobject *kobj); +void kobject_put (struct kobject *kobj); -extern const void *kobject_namespace(const struct kobject *kobj); -extern void kobject_get_ownership(const struct kobject *kobj, - kuid_t *uid, kgid_t *gid); -extern char *kobject_get_path(const struct kobject *kobj, gfp_t flag); +const void *kobject_namespace (const struct kobject *kobj); +void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid); +char *kobject_get_path (const struct kobject *kobj,gfp_t flag);struct kobj_type {void (*release)(struct kobject *kobj);
@@ -176,12 +170,11 @@ struct kset {const struct kset_uevent_ops *uevent_ops; } __randomize_layout; -extern void kset_init (struct kset *kset); -extern int __must_check kset_register (struct kset *kset); -extern void kset_unregister (struct kset *kset); -extern struct kset *__must_check kset_create_and_add (const char *name, -const struct kset_uevent_ops *u, -struct kobject *parent_kobj); +void kset_init (struct kset *kset); +int __must_check kset_register (struct kset *kset); +void kset_unregister (struct kset *kset); +struct kset *__must_check kset_create_and_add (const char *name,const struct kset_uevent_ops *u, +struct kobject *parent_kobj);static inline struct kset *to_kset (struct kobject *kobj) {
@@ -203,7 +196,7 @@ static inline const struct kobj_type *get_ktype(const struct kobject *kobj)return kobj->ktype; } -extern struct kobject *kset_find_obj (struct kset *,const char *); +struct kobject *kset_find_obj (struct kset *,const char *);/* The global /sys/kernel/ kobject for people to chain off of */ extern struct kobject *kernel_kobj;
Signature · 1 line
2.40.0
Quoted 7 lines · Greg Kroah-Hartman
The kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from
include/linux/device.has they are not needed.Cc "Rafael J. Wysocki" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
for this one and the rest of the series.
Quoted 21 lines
--- include/linux/device.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)include/linux/device.h +1
-3@@ -1088,8 +1088,7 @@ void device_link_remove(void *consumer, struct device *supplier);void device_links_supplier_sync_state_pause (void );void device_links_supplier_sync_state_resume (void ); -extern __printf(3, 4) -int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); +__printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...);/* Create alias, so I can be autoloaded. */ #define MODULE_ALIAS_CHARDEV (major,minor) \ --2.40.0
Greg Kroah-Hartman
maintainerQuoted 7 lines · Rafael J. Wysocki
Quoted 5 lines · Greg Kroah-Hartman
The kernel coding style does not require 'extern' in function prototypes in .h files, so remove them from
include/linux/device.has they are not needed.
Quoted 6 lines
Quoted 2 lines
Cc "Rafael J. Wysocki" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>for this one and the rest of the series.
Thanks for the review!
greg k-h