| Message ID | 1513556924.31581.51.camel@perches.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [trivial] treewide: Align function definition open/close braces | expand |
On Mon, Dec 18, 2017 at 2:28 AM, Joe Perches <joe@perches.com> wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > drivers/platform/x86/eeepc-laptop.c | 2 +- > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c > index 5a681962899c..4c38904a8a32 100644 > --- a/drivers/platform/x86/eeepc-laptop.c > +++ b/drivers/platform/x86/eeepc-laptop.c > @@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct eeepc_laptop *eeepc) > * potentially bad time, such as a timer interrupt. > */ > static void tpd_led_update(struct work_struct *work) > - { > +{ > struct eeepc_laptop *eeepc; > > eeepc = container_of(work, struct eeepc_laptop, tpd_led_work); > diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c > index a319bf1e49de..ef5c16dfabfa 100644 Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> for PDx86 changes.
On Monday, December 18, 2017 1:28:44 AM CET Joe Perches wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > --- > git diff -w shows no difference other than the above 'Miscellanea' > > (this is against -next, but it applies against Linus' tree > with a couple offsets) > > arch/x86/include/asm/atomic64_32.h | 2 +- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/fan.c | 2 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- > drivers/media/i2c/msp3400-kthreads.c | 2 +- > drivers/message/fusion/mptsas.c | 2 +- > drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- > drivers/net/wireless/ath/ath9k/xmit.c | 2 +- > drivers/platform/x86/eeepc-laptop.c | 2 +- > drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- > drivers/scsi/dpt_i2o.c | 2 +- > drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- > fs/locks.c | 2 +- > fs/ocfs2/stack_user.c | 2 +- > fs/xfs/libxfs/xfs_alloc.c | 5 ++--- > fs/xfs/xfs_export.c | 2 +- > kernel/audit.c | 6 +++--- > kernel/trace/trace_printk.c | 4 ++-- > lib/raid6/sse2.c | 14 +++++++------- > sound/soc/fsl/fsl_dma.c | 2 +- > 20 files changed, 30 insertions(+), 31 deletions(-) > > diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h > index 97c46b8169b7..d4d4883080fa 100644 > --- a/arch/x86/include/asm/atomic64_32.h > +++ b/arch/x86/include/asm/atomic64_32.h > @@ -122,7 +122,7 @@ static inline long long atomic64_read(const atomic64_t *v) > long long r; > alternative_atomic64(read, "=&A" (r), "c" (v) : "memory"); > return r; > - } > +} > > /** > * atomic64_add_return - add and return > diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c > index c68e72414a67..e967c1173ba3 100644 > --- a/drivers/acpi/custom_method.c > +++ b/drivers/acpi/custom_method.c > @@ -94,7 +94,7 @@ static void __exit acpi_custom_method_exit(void) > { > if (cm_dentry) > debugfs_remove(cm_dentry); > - } > +} > > module_init(acpi_custom_method_init); > module_exit(acpi_custom_method_exit); > diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c > index 6cf4988206f2..3563103590c6 100644 > --- a/drivers/acpi/fan.c > +++ b/drivers/acpi/fan.c > @@ -219,7 +219,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) > return fan_set_state_acpi4(device, state); > else > return fan_set_state(device, state); > - } > +} > > static const struct thermal_cooling_device_ops fan_cooling_ops = { > .get_max_state = fan_get_max_state, > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > index d1488d5ee028..1e0d1e7c5324 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -461,7 +461,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) > ******************************************************************************/ > > struct dc *dc_create(const struct dc_init_data *init_params) > - { > +{ > struct dc *dc = kzalloc(sizeof(*dc), GFP_KERNEL); > unsigned int full_pipe_count; > > diff --git a/drivers/media/i2c/msp3400-kthreads.c b/drivers/media/i2c/msp3400-kthreads.c > index 4dd01e9f553b..dc6cb8d475b3 100644 > --- a/drivers/media/i2c/msp3400-kthreads.c > +++ b/drivers/media/i2c/msp3400-kthreads.c > @@ -885,7 +885,7 @@ static int msp34xxg_modus(struct i2c_client *client) > } > > static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) > - { > +{ > struct msp_state *state = to_state(i2c_get_clientdata(client)); > int source, matrix; > > diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c > index 345f6035599e..69a62d23514b 100644 > --- a/drivers/message/fusion/mptsas.c > +++ b/drivers/message/fusion/mptsas.c > @@ -2968,7 +2968,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc, > mutex_unlock(&ioc->sas_mgmt.mutex); > out: > return ret; > - } > +} > > static void > mptsas_parse_device_info(struct sas_identify *identify, > diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > index 3dd973475125..0ea141ece19e 100644 > --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > @@ -603,7 +603,7 @@ static struct uni_table_desc *nx_get_table_desc(const u8 *unirom, int section) > > static int > netxen_nic_validate_header(struct netxen_adapter *adapter) > - { > +{ > const u8 *unirom = adapter->fw->data; > struct uni_table_desc *directory = (struct uni_table_desc *) &unirom[0]; > u32 fw_file_size = adapter->fw->size; > diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c > index bd438062a6db..baedc7186b10 100644 > --- a/drivers/net/wireless/ath/ath9k/xmit.c > +++ b/drivers/net/wireless/ath/ath9k/xmit.c > @@ -196,7 +196,7 @@ ath_tid_pull(struct ath_atx_tid *tid) > } > > return skb; > - } > +} > > static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid) > { > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c > index 5a681962899c..4c38904a8a32 100644 > --- a/drivers/platform/x86/eeepc-laptop.c > +++ b/drivers/platform/x86/eeepc-laptop.c > @@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct eeepc_laptop *eeepc) > * potentially bad time, such as a timer interrupt. > */ > static void tpd_led_update(struct work_struct *work) > - { > +{ > struct eeepc_laptop *eeepc; > > eeepc = container_of(work, struct eeepc_laptop, tpd_led_work); > diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c > index a319bf1e49de..ef5c16dfabfa 100644 > --- a/drivers/rtc/rtc-ab-b5ze-s3.c > +++ b/drivers/rtc/rtc-ab-b5ze-s3.c > @@ -648,7 +648,7 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) > ret); > > return ret; > - } > +} > > /* Enable or disable battery low irq generation */ > static inline int _abb5zes3_rtc_battery_low_irq_enable(struct regmap *regmap, > diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c > index fd172b0890d3..a00d822e3142 100644 > --- a/drivers/scsi/dpt_i2o.c > +++ b/drivers/scsi/dpt_i2o.c > @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba) > #endif > > return ret; > - } > +} > > > /*============================================================================ > diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c > index 791a2182de53..7320d5fe4cbc 100644 > --- a/drivers/scsi/sym53c8xx_2/sym_glue.c > +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c > @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit, > scsi_host_put(shost); > > return NULL; > - } > +} > > > /* > diff --git a/fs/locks.c b/fs/locks.c > index 21b4dfa289ee..d2399d001afe 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -559,7 +559,7 @@ static const struct lock_manager_operations lease_manager_ops = { > * Initialize a lease, use the default lock manager operations > */ > static int lease_init(struct file *filp, long type, struct file_lock *fl) > - { > +{ > if (assign_type(fl, type) != 0) > return -EINVAL; > > diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c > index dae9eb7c441e..d2fb97b173da 100644 > --- a/fs/ocfs2/stack_user.c > +++ b/fs/ocfs2/stack_user.c > @@ -398,7 +398,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file, > > static int ocfs2_control_do_setversion_msg(struct file *file, > struct ocfs2_control_message_setv *msg) > - { > +{ > long major, minor; > char *ptr = NULL; > struct ocfs2_control_private *p = file->private_data; > diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c > index 0da80019a917..217108f765d5 100644 > --- a/fs/xfs/libxfs/xfs_alloc.c > +++ b/fs/xfs/libxfs/xfs_alloc.c > @@ -2401,7 +2401,7 @@ static bool > xfs_agf_verify( > struct xfs_mount *mp, > struct xfs_buf *bp) > - { > +{ > struct xfs_agf *agf = XFS_BUF_TO_AGF(bp); > > if (xfs_sb_version_hascrc(&mp->m_sb)) { > @@ -2449,8 +2449,7 @@ xfs_agf_verify( > be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)) > return false; > > - return true;; > - > + return true; > } > > static void > diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c > index fe1bfee35898..7d5c355d78b5 100644 > --- a/fs/xfs/xfs_export.c > +++ b/fs/xfs/xfs_export.c > @@ -122,7 +122,7 @@ xfs_nfs_get_inode( > struct super_block *sb, > u64 ino, > u32 generation) > - { > +{ > xfs_mount_t *mp = XFS_M(sb); > xfs_inode_t *ip; > int error; > diff --git a/kernel/audit.c b/kernel/audit.c > index 227db99b0f19..d97e8f0f73ca 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -443,15 +443,15 @@ static int audit_set_failure(u32 state) > * Drop any references inside the auditd connection tracking struct and free > * the memory. > */ > - static void auditd_conn_free(struct rcu_head *rcu) > - { > +static void auditd_conn_free(struct rcu_head *rcu) > +{ > struct auditd_connection *ac; > > ac = container_of(rcu, struct auditd_connection, rcu); > put_pid(ac->pid); > put_net(ac->net); > kfree(ac); > - } > +} > > /** > * auditd_set - Set/Reset the auditd connection state > diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c > index ad1d6164e946..50f44b7b2b32 100644 > --- a/kernel/trace/trace_printk.c > +++ b/kernel/trace/trace_printk.c > @@ -196,7 +196,7 @@ struct notifier_block module_trace_bprintk_format_nb = { > }; > > int __trace_bprintk(unsigned long ip, const char *fmt, ...) > - { > +{ > int ret; > va_list ap; > > @@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...) > EXPORT_SYMBOL_GPL(__trace_bprintk); > > int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap) > - { > +{ > if (unlikely(!fmt)) > return 0; > > diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c > index 1d2276b007ee..8191e1d0d2fb 100644 > --- a/lib/raid6/sse2.c > +++ b/lib/raid6/sse2.c > @@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int disks, size_t bytes, void **ptrs) > > static void raid6_sse21_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -200,9 +200,9 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -265,7 +265,7 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > const struct raid6_calls raid6_sse2x2 = { > raid6_sse22_gen_syndrome, > @@ -366,9 +366,9 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -471,7 +471,7 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > } > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > > const struct raid6_calls raid6_sse2x4 = { > diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c > index 0c11f434a374..ec619f51d336 100644 > --- a/sound/soc/fsl/fsl_dma.c > +++ b/sound/soc/fsl/fsl_dma.c > @@ -879,7 +879,7 @@ static const struct snd_pcm_ops fsl_dma_ops = { > }; > > static int fsl_soc_dma_probe(struct platform_device *pdev) > - { > +{ > struct dma_object *dma; > struct device_node *np = pdev->dev.of_node; > struct device_node *ssi_np; > > -- Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> for the ACPI part. Thanks!
On Sun, Dec 17, 2017 at 7:28 PM, Joe Perches <joe@perches.com> wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > --- > git diff -w shows no difference other than the above 'Miscellanea' > > (this is against -next, but it applies against Linus' tree > with a couple offsets) > > arch/x86/include/asm/atomic64_32.h | 2 +- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/fan.c | 2 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- > drivers/media/i2c/msp3400-kthreads.c | 2 +- > drivers/message/fusion/mptsas.c | 2 +- > drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- > drivers/net/wireless/ath/ath9k/xmit.c | 2 +- > drivers/platform/x86/eeepc-laptop.c | 2 +- > drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- > drivers/scsi/dpt_i2o.c | 2 +- > drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- > fs/locks.c | 2 +- > fs/ocfs2/stack_user.c | 2 +- > fs/xfs/libxfs/xfs_alloc.c | 5 ++--- > fs/xfs/xfs_export.c | 2 +- > kernel/audit.c | 6 +++--- > kernel/trace/trace_printk.c | 4 ++-- > lib/raid6/sse2.c | 14 +++++++------- > sound/soc/fsl/fsl_dma.c | 2 +- > 20 files changed, 30 insertions(+), 31 deletions(-) For the audit bits ... Acked-by: Paul Moore <paul@paul-moore.com>
On Sun, Dec 17, 2017 at 7:28 PM, Joe Perches <joe@perches.com> wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > --- > git diff -w shows no difference other than the above 'Miscellanea' > > (this is against -next, but it applies against Linus' tree > with a couple offsets) > > arch/x86/include/asm/atomic64_32.h | 2 +- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/fan.c | 2 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- For amdgpu: Acked-by: Alex Deucher <alexander.deucher@amd.com> > drivers/media/i2c/msp3400-kthreads.c | 2 +- > drivers/message/fusion/mptsas.c | 2 +- > drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- > drivers/net/wireless/ath/ath9k/xmit.c | 2 +- > drivers/platform/x86/eeepc-laptop.c | 2 +- > drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- > drivers/scsi/dpt_i2o.c | 2 +- > drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- > fs/locks.c | 2 +- > fs/ocfs2/stack_user.c | 2 +- > fs/xfs/libxfs/xfs_alloc.c | 5 ++--- > fs/xfs/xfs_export.c | 2 +- > kernel/audit.c | 6 +++--- > kernel/trace/trace_printk.c | 4 ++-- > lib/raid6/sse2.c | 14 +++++++------- > sound/soc/fsl/fsl_dma.c | 2 +- > 20 files changed, 30 insertions(+), 31 deletions(-) > > diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h > index 97c46b8169b7..d4d4883080fa 100644 > --- a/arch/x86/include/asm/atomic64_32.h > +++ b/arch/x86/include/asm/atomic64_32.h > @@ -122,7 +122,7 @@ static inline long long atomic64_read(const atomic64_t *v) > long long r; > alternative_atomic64(read, "=&A" (r), "c" (v) : "memory"); > return r; > - } > +} > > /** > * atomic64_add_return - add and return > diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c > index c68e72414a67..e967c1173ba3 100644 > --- a/drivers/acpi/custom_method.c > +++ b/drivers/acpi/custom_method.c > @@ -94,7 +94,7 @@ static void __exit acpi_custom_method_exit(void) > { > if (cm_dentry) > debugfs_remove(cm_dentry); > - } > +} > > module_init(acpi_custom_method_init); > module_exit(acpi_custom_method_exit); > diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c > index 6cf4988206f2..3563103590c6 100644 > --- a/drivers/acpi/fan.c > +++ b/drivers/acpi/fan.c > @@ -219,7 +219,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) > return fan_set_state_acpi4(device, state); > else > return fan_set_state(device, state); > - } > +} > > static const struct thermal_cooling_device_ops fan_cooling_ops = { > .get_max_state = fan_get_max_state, > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > index d1488d5ee028..1e0d1e7c5324 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -461,7 +461,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) > ******************************************************************************/ > > struct dc *dc_create(const struct dc_init_data *init_params) > - { > +{ > struct dc *dc = kzalloc(sizeof(*dc), GFP_KERNEL); > unsigned int full_pipe_count; > > diff --git a/drivers/media/i2c/msp3400-kthreads.c b/drivers/media/i2c/msp3400-kthreads.c > index 4dd01e9f553b..dc6cb8d475b3 100644 > --- a/drivers/media/i2c/msp3400-kthreads.c > +++ b/drivers/media/i2c/msp3400-kthreads.c > @@ -885,7 +885,7 @@ static int msp34xxg_modus(struct i2c_client *client) > } > > static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) > - { > +{ > struct msp_state *state = to_state(i2c_get_clientdata(client)); > int source, matrix; > > diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c > index 345f6035599e..69a62d23514b 100644 > --- a/drivers/message/fusion/mptsas.c > +++ b/drivers/message/fusion/mptsas.c > @@ -2968,7 +2968,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc, > mutex_unlock(&ioc->sas_mgmt.mutex); > out: > return ret; > - } > +} > > static void > mptsas_parse_device_info(struct sas_identify *identify, > diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > index 3dd973475125..0ea141ece19e 100644 > --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > @@ -603,7 +603,7 @@ static struct uni_table_desc *nx_get_table_desc(const u8 *unirom, int section) > > static int > netxen_nic_validate_header(struct netxen_adapter *adapter) > - { > +{ > const u8 *unirom = adapter->fw->data; > struct uni_table_desc *directory = (struct uni_table_desc *) &unirom[0]; > u32 fw_file_size = adapter->fw->size; > diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c > index bd438062a6db..baedc7186b10 100644 > --- a/drivers/net/wireless/ath/ath9k/xmit.c > +++ b/drivers/net/wireless/ath/ath9k/xmit.c > @@ -196,7 +196,7 @@ ath_tid_pull(struct ath_atx_tid *tid) > } > > return skb; > - } > +} > > static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid) > { > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c > index 5a681962899c..4c38904a8a32 100644 > --- a/drivers/platform/x86/eeepc-laptop.c > +++ b/drivers/platform/x86/eeepc-laptop.c > @@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct eeepc_laptop *eeepc) > * potentially bad time, such as a timer interrupt. > */ > static void tpd_led_update(struct work_struct *work) > - { > +{ > struct eeepc_laptop *eeepc; > > eeepc = container_of(work, struct eeepc_laptop, tpd_led_work); > diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c > index a319bf1e49de..ef5c16dfabfa 100644 > --- a/drivers/rtc/rtc-ab-b5ze-s3.c > +++ b/drivers/rtc/rtc-ab-b5ze-s3.c > @@ -648,7 +648,7 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) > ret); > > return ret; > - } > +} > > /* Enable or disable battery low irq generation */ > static inline int _abb5zes3_rtc_battery_low_irq_enable(struct regmap *regmap, > diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c > index fd172b0890d3..a00d822e3142 100644 > --- a/drivers/scsi/dpt_i2o.c > +++ b/drivers/scsi/dpt_i2o.c > @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba) > #endif > > return ret; > - } > +} > > > /*============================================================================ > diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c > index 791a2182de53..7320d5fe4cbc 100644 > --- a/drivers/scsi/sym53c8xx_2/sym_glue.c > +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c > @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit, > scsi_host_put(shost); > > return NULL; > - } > +} > > > /* > diff --git a/fs/locks.c b/fs/locks.c > index 21b4dfa289ee..d2399d001afe 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -559,7 +559,7 @@ static const struct lock_manager_operations lease_manager_ops = { > * Initialize a lease, use the default lock manager operations > */ > static int lease_init(struct file *filp, long type, struct file_lock *fl) > - { > +{ > if (assign_type(fl, type) != 0) > return -EINVAL; > > diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c > index dae9eb7c441e..d2fb97b173da 100644 > --- a/fs/ocfs2/stack_user.c > +++ b/fs/ocfs2/stack_user.c > @@ -398,7 +398,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file, > > static int ocfs2_control_do_setversion_msg(struct file *file, > struct ocfs2_control_message_setv *msg) > - { > +{ > long major, minor; > char *ptr = NULL; > struct ocfs2_control_private *p = file->private_data; > diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c > index 0da80019a917..217108f765d5 100644 > --- a/fs/xfs/libxfs/xfs_alloc.c > +++ b/fs/xfs/libxfs/xfs_alloc.c > @@ -2401,7 +2401,7 @@ static bool > xfs_agf_verify( > struct xfs_mount *mp, > struct xfs_buf *bp) > - { > +{ > struct xfs_agf *agf = XFS_BUF_TO_AGF(bp); > > if (xfs_sb_version_hascrc(&mp->m_sb)) { > @@ -2449,8 +2449,7 @@ xfs_agf_verify( > be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)) > return false; > > - return true;; > - > + return true; > } > > static void > diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c > index fe1bfee35898..7d5c355d78b5 100644 > --- a/fs/xfs/xfs_export.c > +++ b/fs/xfs/xfs_export.c > @@ -122,7 +122,7 @@ xfs_nfs_get_inode( > struct super_block *sb, > u64 ino, > u32 generation) > - { > +{ > xfs_mount_t *mp = XFS_M(sb); > xfs_inode_t *ip; > int error; > diff --git a/kernel/audit.c b/kernel/audit.c > index 227db99b0f19..d97e8f0f73ca 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -443,15 +443,15 @@ static int audit_set_failure(u32 state) > * Drop any references inside the auditd connection tracking struct and free > * the memory. > */ > - static void auditd_conn_free(struct rcu_head *rcu) > - { > +static void auditd_conn_free(struct rcu_head *rcu) > +{ > struct auditd_connection *ac; > > ac = container_of(rcu, struct auditd_connection, rcu); > put_pid(ac->pid); > put_net(ac->net); > kfree(ac); > - } > +} > > /** > * auditd_set - Set/Reset the auditd connection state > diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c > index ad1d6164e946..50f44b7b2b32 100644 > --- a/kernel/trace/trace_printk.c > +++ b/kernel/trace/trace_printk.c > @@ -196,7 +196,7 @@ struct notifier_block module_trace_bprintk_format_nb = { > }; > > int __trace_bprintk(unsigned long ip, const char *fmt, ...) > - { > +{ > int ret; > va_list ap; > > @@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...) > EXPORT_SYMBOL_GPL(__trace_bprintk); > > int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap) > - { > +{ > if (unlikely(!fmt)) > return 0; > > diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c > index 1d2276b007ee..8191e1d0d2fb 100644 > --- a/lib/raid6/sse2.c > +++ b/lib/raid6/sse2.c > @@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int disks, size_t bytes, void **ptrs) > > static void raid6_sse21_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -200,9 +200,9 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -265,7 +265,7 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > const struct raid6_calls raid6_sse2x2 = { > raid6_sse22_gen_syndrome, > @@ -366,9 +366,9 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -471,7 +471,7 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > } > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > > const struct raid6_calls raid6_sse2x4 = { > diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c > index 0c11f434a374..ec619f51d336 100644 > --- a/sound/soc/fsl/fsl_dma.c > +++ b/sound/soc/fsl/fsl_dma.c > @@ -879,7 +879,7 @@ static const struct snd_pcm_ops fsl_dma_ops = { > }; > > static int fsl_soc_dma_probe(struct platform_device *pdev) > - { > +{ > struct dma_object *dma; > struct device_node *np = pdev->dev.of_node; > struct device_node *ssi_np; > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Sun, Dec 17, 2017 at 04:28:44PM -0800, Joe Perches wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > --- > git diff -w shows no difference other than the above 'Miscellanea' > > (this is against -next, but it applies against Linus' tree > with a couple offsets) > > arch/x86/include/asm/atomic64_32.h | 2 +- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/fan.c | 2 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- > drivers/media/i2c/msp3400-kthreads.c | 2 +- > drivers/message/fusion/mptsas.c | 2 +- > drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- > drivers/net/wireless/ath/ath9k/xmit.c | 2 +- > drivers/platform/x86/eeepc-laptop.c | 2 +- > drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- > drivers/scsi/dpt_i2o.c | 2 +- > drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- > fs/locks.c | 2 +- > fs/ocfs2/stack_user.c | 2 +- > fs/xfs/libxfs/xfs_alloc.c | 5 ++--- > fs/xfs/xfs_export.c | 2 +- > kernel/audit.c | 6 +++--- > kernel/trace/trace_printk.c | 4 ++-- > lib/raid6/sse2.c | 14 +++++++------- > sound/soc/fsl/fsl_dma.c | 2 +- > 20 files changed, 30 insertions(+), 31 deletions(-) > > diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h > index 97c46b8169b7..d4d4883080fa 100644 > --- a/arch/x86/include/asm/atomic64_32.h > +++ b/arch/x86/include/asm/atomic64_32.h > @@ -122,7 +122,7 @@ static inline long long atomic64_read(const atomic64_t *v) > long long r; > alternative_atomic64(read, "=&A" (r), "c" (v) : "memory"); > return r; > - } > +} > > /** > * atomic64_add_return - add and return > diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c > index c68e72414a67..e967c1173ba3 100644 > --- a/drivers/acpi/custom_method.c > +++ b/drivers/acpi/custom_method.c > @@ -94,7 +94,7 @@ static void __exit acpi_custom_method_exit(void) > { > if (cm_dentry) > debugfs_remove(cm_dentry); > - } > +} > > module_init(acpi_custom_method_init); > module_exit(acpi_custom_method_exit); > diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c > index 6cf4988206f2..3563103590c6 100644 > --- a/drivers/acpi/fan.c > +++ b/drivers/acpi/fan.c > @@ -219,7 +219,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) > return fan_set_state_acpi4(device, state); > else > return fan_set_state(device, state); > - } > +} > > static const struct thermal_cooling_device_ops fan_cooling_ops = { > .get_max_state = fan_get_max_state, > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > index d1488d5ee028..1e0d1e7c5324 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -461,7 +461,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) > ******************************************************************************/ > > struct dc *dc_create(const struct dc_init_data *init_params) > - { > +{ > struct dc *dc = kzalloc(sizeof(*dc), GFP_KERNEL); > unsigned int full_pipe_count; > > diff --git a/drivers/media/i2c/msp3400-kthreads.c b/drivers/media/i2c/msp3400-kthreads.c > index 4dd01e9f553b..dc6cb8d475b3 100644 > --- a/drivers/media/i2c/msp3400-kthreads.c > +++ b/drivers/media/i2c/msp3400-kthreads.c > @@ -885,7 +885,7 @@ static int msp34xxg_modus(struct i2c_client *client) > } > > static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) > - { > +{ > struct msp_state *state = to_state(i2c_get_clientdata(client)); > int source, matrix; > > diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c > index 345f6035599e..69a62d23514b 100644 > --- a/drivers/message/fusion/mptsas.c > +++ b/drivers/message/fusion/mptsas.c > @@ -2968,7 +2968,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc, > mutex_unlock(&ioc->sas_mgmt.mutex); > out: > return ret; > - } > +} > > static void > mptsas_parse_device_info(struct sas_identify *identify, > diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > index 3dd973475125..0ea141ece19e 100644 > --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > @@ -603,7 +603,7 @@ static struct uni_table_desc *nx_get_table_desc(const u8 *unirom, int section) > > static int > netxen_nic_validate_header(struct netxen_adapter *adapter) > - { > +{ > const u8 *unirom = adapter->fw->data; > struct uni_table_desc *directory = (struct uni_table_desc *) &unirom[0]; > u32 fw_file_size = adapter->fw->size; > diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c > index bd438062a6db..baedc7186b10 100644 > --- a/drivers/net/wireless/ath/ath9k/xmit.c > +++ b/drivers/net/wireless/ath/ath9k/xmit.c > @@ -196,7 +196,7 @@ ath_tid_pull(struct ath_atx_tid *tid) > } > > return skb; > - } > +} > > static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid) > { > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c > index 5a681962899c..4c38904a8a32 100644 > --- a/drivers/platform/x86/eeepc-laptop.c > +++ b/drivers/platform/x86/eeepc-laptop.c > @@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct eeepc_laptop *eeepc) > * potentially bad time, such as a timer interrupt. > */ > static void tpd_led_update(struct work_struct *work) > - { > +{ > struct eeepc_laptop *eeepc; > > eeepc = container_of(work, struct eeepc_laptop, tpd_led_work); > diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c > index a319bf1e49de..ef5c16dfabfa 100644 > --- a/drivers/rtc/rtc-ab-b5ze-s3.c > +++ b/drivers/rtc/rtc-ab-b5ze-s3.c > @@ -648,7 +648,7 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) > ret); > > return ret; > - } > +} > > /* Enable or disable battery low irq generation */ > static inline int _abb5zes3_rtc_battery_low_irq_enable(struct regmap *regmap, > diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c > index fd172b0890d3..a00d822e3142 100644 > --- a/drivers/scsi/dpt_i2o.c > +++ b/drivers/scsi/dpt_i2o.c > @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba) > #endif > > return ret; > - } > +} > > > /*============================================================================ > diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c > index 791a2182de53..7320d5fe4cbc 100644 > --- a/drivers/scsi/sym53c8xx_2/sym_glue.c > +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c > @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit, > scsi_host_put(shost); > > return NULL; > - } > +} > > > /* > diff --git a/fs/locks.c b/fs/locks.c > index 21b4dfa289ee..d2399d001afe 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -559,7 +559,7 @@ static const struct lock_manager_operations lease_manager_ops = { > * Initialize a lease, use the default lock manager operations > */ > static int lease_init(struct file *filp, long type, struct file_lock *fl) > - { > +{ > if (assign_type(fl, type) != 0) > return -EINVAL; > > diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c > index dae9eb7c441e..d2fb97b173da 100644 > --- a/fs/ocfs2/stack_user.c > +++ b/fs/ocfs2/stack_user.c > @@ -398,7 +398,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file, > > static int ocfs2_control_do_setversion_msg(struct file *file, > struct ocfs2_control_message_setv *msg) > - { > +{ > long major, minor; > char *ptr = NULL; > struct ocfs2_control_private *p = file->private_data; > diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c > index 0da80019a917..217108f765d5 100644 > --- a/fs/xfs/libxfs/xfs_alloc.c > +++ b/fs/xfs/libxfs/xfs_alloc.c > @@ -2401,7 +2401,7 @@ static bool > xfs_agf_verify( > struct xfs_mount *mp, > struct xfs_buf *bp) > - { > +{ > struct xfs_agf *agf = XFS_BUF_TO_AGF(bp); > > if (xfs_sb_version_hascrc(&mp->m_sb)) { > @@ -2449,8 +2449,7 @@ xfs_agf_verify( > be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)) > return false; > > - return true;; > - > + return true; > } > > static void > diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c > index fe1bfee35898..7d5c355d78b5 100644 > --- a/fs/xfs/xfs_export.c > +++ b/fs/xfs/xfs_export.c > @@ -122,7 +122,7 @@ xfs_nfs_get_inode( > struct super_block *sb, > u64 ino, > u32 generation) > - { > +{ > xfs_mount_t *mp = XFS_M(sb); > xfs_inode_t *ip; > int error; The xfs bits look ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > diff --git a/kernel/audit.c b/kernel/audit.c > index 227db99b0f19..d97e8f0f73ca 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -443,15 +443,15 @@ static int audit_set_failure(u32 state) > * Drop any references inside the auditd connection tracking struct and free > * the memory. > */ > - static void auditd_conn_free(struct rcu_head *rcu) > - { > +static void auditd_conn_free(struct rcu_head *rcu) > +{ > struct auditd_connection *ac; > > ac = container_of(rcu, struct auditd_connection, rcu); > put_pid(ac->pid); > put_net(ac->net); > kfree(ac); > - } > +} > > /** > * auditd_set - Set/Reset the auditd connection state > diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c > index ad1d6164e946..50f44b7b2b32 100644 > --- a/kernel/trace/trace_printk.c > +++ b/kernel/trace/trace_printk.c > @@ -196,7 +196,7 @@ struct notifier_block module_trace_bprintk_format_nb = { > }; > > int __trace_bprintk(unsigned long ip, const char *fmt, ...) > - { > +{ > int ret; > va_list ap; > > @@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...) > EXPORT_SYMBOL_GPL(__trace_bprintk); > > int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap) > - { > +{ > if (unlikely(!fmt)) > return 0; > > diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c > index 1d2276b007ee..8191e1d0d2fb 100644 > --- a/lib/raid6/sse2.c > +++ b/lib/raid6/sse2.c > @@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int disks, size_t bytes, void **ptrs) > > static void raid6_sse21_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -200,9 +200,9 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -265,7 +265,7 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > const struct raid6_calls raid6_sse2x2 = { > raid6_sse22_gen_syndrome, > @@ -366,9 +366,9 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -471,7 +471,7 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > } > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > > const struct raid6_calls raid6_sse2x4 = { > diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c > index 0c11f434a374..ec619f51d336 100644 > --- a/sound/soc/fsl/fsl_dma.c > +++ b/sound/soc/fsl/fsl_dma.c > @@ -879,7 +879,7 @@ static const struct snd_pcm_ops fsl_dma_ops = { > }; > > static int fsl_soc_dma_probe(struct platform_device *pdev) > - { > +{ > struct dma_object *dma; > struct device_node *np = pdev->dev.of_node; > struct device_node *ssi_np; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Dec 17, 2017 at 04:28:44PM -0800, Joe Perches wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > --- .... XFS bits look fine. Acked-by: Dave Chinner <dchinner@redhat.com>
On 17/12/2017 at 16:28:44 -0800, Joe Perches wrote: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> For RTC: Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Joe, > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. SCSI bits look OK. Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
On Mon, 18 Dec 2017 01:28:44 +0100, Joe Perches wrote: > > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> > --- > git diff -w shows no difference other than the above 'Miscellanea' > > (this is against -next, but it applies against Linus' tree > with a couple offsets) > > arch/x86/include/asm/atomic64_32.h | 2 +- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/fan.c | 2 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- > drivers/media/i2c/msp3400-kthreads.c | 2 +- > drivers/message/fusion/mptsas.c | 2 +- > drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- > drivers/net/wireless/ath/ath9k/xmit.c | 2 +- > drivers/platform/x86/eeepc-laptop.c | 2 +- > drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- > drivers/scsi/dpt_i2o.c | 2 +- > drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- > fs/locks.c | 2 +- > fs/ocfs2/stack_user.c | 2 +- > fs/xfs/libxfs/xfs_alloc.c | 5 ++--- > fs/xfs/xfs_export.c | 2 +- > kernel/audit.c | 6 +++--- > kernel/trace/trace_printk.c | 4 ++-- > lib/raid6/sse2.c | 14 +++++++------- > sound/soc/fsl/fsl_dma.c | 2 +- For sound bits, Acked-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi
Em Sun, 17 Dec 2017 16:28:44 -0800 Joe Perches <joe@perches.com> escreveu: > Some functions definitions have either the initial open brace and/or > the closing brace outside of column 1. > > Move those braces to column 1. > > This allows various function analyzers like gnu complexity to work > properly for these modified functions. > > Miscellanea: > > o Remove extra trailing ; and blank line from xfs_agf_verify > > Signed-off-by: Joe Perches <joe@perches.com> For the media patch: Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> > --- > git diff -w shows no difference other than the above 'Miscellanea' > > (this is against -next, but it applies against Linus' tree > with a couple offsets) > > arch/x86/include/asm/atomic64_32.h | 2 +- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/fan.c | 2 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- > drivers/media/i2c/msp3400-kthreads.c | 2 +- > drivers/message/fusion/mptsas.c | 2 +- > drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- > drivers/net/wireless/ath/ath9k/xmit.c | 2 +- > drivers/platform/x86/eeepc-laptop.c | 2 +- > drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- > drivers/scsi/dpt_i2o.c | 2 +- > drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- > fs/locks.c | 2 +- > fs/ocfs2/stack_user.c | 2 +- > fs/xfs/libxfs/xfs_alloc.c | 5 ++--- > fs/xfs/xfs_export.c | 2 +- > kernel/audit.c | 6 +++--- > kernel/trace/trace_printk.c | 4 ++-- > lib/raid6/sse2.c | 14 +++++++------- > sound/soc/fsl/fsl_dma.c | 2 +- > 20 files changed, 30 insertions(+), 31 deletions(-) > > diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h > index 97c46b8169b7..d4d4883080fa 100644 > --- a/arch/x86/include/asm/atomic64_32.h > +++ b/arch/x86/include/asm/atomic64_32.h > @@ -122,7 +122,7 @@ static inline long long atomic64_read(const atomic64_t *v) > long long r; > alternative_atomic64(read, "=&A" (r), "c" (v) : "memory"); > return r; > - } > +} > > /** > * atomic64_add_return - add and return > diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c > index c68e72414a67..e967c1173ba3 100644 > --- a/drivers/acpi/custom_method.c > +++ b/drivers/acpi/custom_method.c > @@ -94,7 +94,7 @@ static void __exit acpi_custom_method_exit(void) > { > if (cm_dentry) > debugfs_remove(cm_dentry); > - } > +} > > module_init(acpi_custom_method_init); > module_exit(acpi_custom_method_exit); > diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c > index 6cf4988206f2..3563103590c6 100644 > --- a/drivers/acpi/fan.c > +++ b/drivers/acpi/fan.c > @@ -219,7 +219,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) > return fan_set_state_acpi4(device, state); > else > return fan_set_state(device, state); > - } > +} > > static const struct thermal_cooling_device_ops fan_cooling_ops = { > .get_max_state = fan_get_max_state, > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > index d1488d5ee028..1e0d1e7c5324 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -461,7 +461,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) > ******************************************************************************/ > > struct dc *dc_create(const struct dc_init_data *init_params) > - { > +{ > struct dc *dc = kzalloc(sizeof(*dc), GFP_KERNEL); > unsigned int full_pipe_count; > > diff --git a/drivers/media/i2c/msp3400-kthreads.c b/drivers/media/i2c/msp3400-kthreads.c > index 4dd01e9f553b..dc6cb8d475b3 100644 > --- a/drivers/media/i2c/msp3400-kthreads.c > +++ b/drivers/media/i2c/msp3400-kthreads.c > @@ -885,7 +885,7 @@ static int msp34xxg_modus(struct i2c_client *client) > } > > static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) > - { > +{ > struct msp_state *state = to_state(i2c_get_clientdata(client)); > int source, matrix; > > diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c > index 345f6035599e..69a62d23514b 100644 > --- a/drivers/message/fusion/mptsas.c > +++ b/drivers/message/fusion/mptsas.c > @@ -2968,7 +2968,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc, > mutex_unlock(&ioc->sas_mgmt.mutex); > out: > return ret; > - } > +} > > static void > mptsas_parse_device_info(struct sas_identify *identify, > diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > index 3dd973475125..0ea141ece19e 100644 > --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c > @@ -603,7 +603,7 @@ static struct uni_table_desc *nx_get_table_desc(const u8 *unirom, int section) > > static int > netxen_nic_validate_header(struct netxen_adapter *adapter) > - { > +{ > const u8 *unirom = adapter->fw->data; > struct uni_table_desc *directory = (struct uni_table_desc *) &unirom[0]; > u32 fw_file_size = adapter->fw->size; > diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c > index bd438062a6db..baedc7186b10 100644 > --- a/drivers/net/wireless/ath/ath9k/xmit.c > +++ b/drivers/net/wireless/ath/ath9k/xmit.c > @@ -196,7 +196,7 @@ ath_tid_pull(struct ath_atx_tid *tid) > } > > return skb; > - } > +} > > static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid) > { > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c > index 5a681962899c..4c38904a8a32 100644 > --- a/drivers/platform/x86/eeepc-laptop.c > +++ b/drivers/platform/x86/eeepc-laptop.c > @@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct eeepc_laptop *eeepc) > * potentially bad time, such as a timer interrupt. > */ > static void tpd_led_update(struct work_struct *work) > - { > +{ > struct eeepc_laptop *eeepc; > > eeepc = container_of(work, struct eeepc_laptop, tpd_led_work); > diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c > index a319bf1e49de..ef5c16dfabfa 100644 > --- a/drivers/rtc/rtc-ab-b5ze-s3.c > +++ b/drivers/rtc/rtc-ab-b5ze-s3.c > @@ -648,7 +648,7 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) > ret); > > return ret; > - } > +} > > /* Enable or disable battery low irq generation */ > static inline int _abb5zes3_rtc_battery_low_irq_enable(struct regmap *regmap, > diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c > index fd172b0890d3..a00d822e3142 100644 > --- a/drivers/scsi/dpt_i2o.c > +++ b/drivers/scsi/dpt_i2o.c > @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba) > #endif > > return ret; > - } > +} > > > /*============================================================================ > diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c > index 791a2182de53..7320d5fe4cbc 100644 > --- a/drivers/scsi/sym53c8xx_2/sym_glue.c > +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c > @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit, > scsi_host_put(shost); > > return NULL; > - } > +} > > > /* > diff --git a/fs/locks.c b/fs/locks.c > index 21b4dfa289ee..d2399d001afe 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -559,7 +559,7 @@ static const struct lock_manager_operations lease_manager_ops = { > * Initialize a lease, use the default lock manager operations > */ > static int lease_init(struct file *filp, long type, struct file_lock *fl) > - { > +{ > if (assign_type(fl, type) != 0) > return -EINVAL; > > diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c > index dae9eb7c441e..d2fb97b173da 100644 > --- a/fs/ocfs2/stack_user.c > +++ b/fs/ocfs2/stack_user.c > @@ -398,7 +398,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file, > > static int ocfs2_control_do_setversion_msg(struct file *file, > struct ocfs2_control_message_setv *msg) > - { > +{ > long major, minor; > char *ptr = NULL; > struct ocfs2_control_private *p = file->private_data; > diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c > index 0da80019a917..217108f765d5 100644 > --- a/fs/xfs/libxfs/xfs_alloc.c > +++ b/fs/xfs/libxfs/xfs_alloc.c > @@ -2401,7 +2401,7 @@ static bool > xfs_agf_verify( > struct xfs_mount *mp, > struct xfs_buf *bp) > - { > +{ > struct xfs_agf *agf = XFS_BUF_TO_AGF(bp); > > if (xfs_sb_version_hascrc(&mp->m_sb)) { > @@ -2449,8 +2449,7 @@ xfs_agf_verify( > be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)) > return false; > > - return true;; > - > + return true; > } > > static void > diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c > index fe1bfee35898..7d5c355d78b5 100644 > --- a/fs/xfs/xfs_export.c > +++ b/fs/xfs/xfs_export.c > @@ -122,7 +122,7 @@ xfs_nfs_get_inode( > struct super_block *sb, > u64 ino, > u32 generation) > - { > +{ > xfs_mount_t *mp = XFS_M(sb); > xfs_inode_t *ip; > int error; > diff --git a/kernel/audit.c b/kernel/audit.c > index 227db99b0f19..d97e8f0f73ca 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -443,15 +443,15 @@ static int audit_set_failure(u32 state) > * Drop any references inside the auditd connection tracking struct and free > * the memory. > */ > - static void auditd_conn_free(struct rcu_head *rcu) > - { > +static void auditd_conn_free(struct rcu_head *rcu) > +{ > struct auditd_connection *ac; > > ac = container_of(rcu, struct auditd_connection, rcu); > put_pid(ac->pid); > put_net(ac->net); > kfree(ac); > - } > +} > > /** > * auditd_set - Set/Reset the auditd connection state > diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c > index ad1d6164e946..50f44b7b2b32 100644 > --- a/kernel/trace/trace_printk.c > +++ b/kernel/trace/trace_printk.c > @@ -196,7 +196,7 @@ struct notifier_block module_trace_bprintk_format_nb = { > }; > > int __trace_bprintk(unsigned long ip, const char *fmt, ...) > - { > +{ > int ret; > va_list ap; > > @@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...) > EXPORT_SYMBOL_GPL(__trace_bprintk); > > int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap) > - { > +{ > if (unlikely(!fmt)) > return 0; > > diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c > index 1d2276b007ee..8191e1d0d2fb 100644 > --- a/lib/raid6/sse2.c > +++ b/lib/raid6/sse2.c > @@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int disks, size_t bytes, void **ptrs) > > static void raid6_sse21_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -200,9 +200,9 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse22_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -265,7 +265,7 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) > > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > const struct raid6_calls raid6_sse2x2 = { > raid6_sse22_gen_syndrome, > @@ -366,9 +366,9 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > kernel_fpu_end(); > } > > - static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > +static void raid6_sse24_xor_syndrome(int disks, int start, int stop, > size_t bytes, void **ptrs) > - { > +{ > u8 **dptr = (u8 **)ptrs; > u8 *p, *q; > int d, z, z0; > @@ -471,7 +471,7 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) > } > asm volatile("sfence" : : : "memory"); > kernel_fpu_end(); > - } > +} > > > const struct raid6_calls raid6_sse2x4 = { > diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c > index 0c11f434a374..ec619f51d336 100644 > --- a/sound/soc/fsl/fsl_dma.c > +++ b/sound/soc/fsl/fsl_dma.c > @@ -879,7 +879,7 @@ static const struct snd_pcm_ops fsl_dma_ops = { > }; > > static int fsl_soc_dma_probe(struct platform_device *pdev) > - { > +{ > struct dma_object *dma; > struct device_node *np = pdev->dev.of_node; > struct device_node *ssi_np; > Thanks, Mauro
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index 97c46b8169b7..d4d4883080fa 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h @@ -122,7 +122,7 @@ static inline long long atomic64_read(const atomic64_t *v) long long r; alternative_atomic64(read, "=&A" (r), "c" (v) : "memory"); return r; - } +} /** * atomic64_add_return - add and return diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c index c68e72414a67..e967c1173ba3 100644 --- a/drivers/acpi/custom_method.c +++ b/drivers/acpi/custom_method.c @@ -94,7 +94,7 @@ static void __exit acpi_custom_method_exit(void) { if (cm_dentry) debugfs_remove(cm_dentry); - } +} module_init(acpi_custom_method_init); module_exit(acpi_custom_method_exit); diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 6cf4988206f2..3563103590c6 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -219,7 +219,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) return fan_set_state_acpi4(device, state); else return fan_set_state(device, state); - } +} static const struct thermal_cooling_device_ops fan_cooling_ops = { .get_max_state = fan_get_max_state, diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index d1488d5ee028..1e0d1e7c5324 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -461,7 +461,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) ******************************************************************************/ struct dc *dc_create(const struct dc_init_data *init_params) - { +{ struct dc *dc = kzalloc(sizeof(*dc), GFP_KERNEL); unsigned int full_pipe_count; diff --git a/drivers/media/i2c/msp3400-kthreads.c b/drivers/media/i2c/msp3400-kthreads.c index 4dd01e9f553b..dc6cb8d475b3 100644 --- a/drivers/media/i2c/msp3400-kthreads.c +++ b/drivers/media/i2c/msp3400-kthreads.c @@ -885,7 +885,7 @@ static int msp34xxg_modus(struct i2c_client *client) } static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) - { +{ struct msp_state *state = to_state(i2c_get_clientdata(client)); int source, matrix; diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 345f6035599e..69a62d23514b 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -2968,7 +2968,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc, mutex_unlock(&ioc->sas_mgmt.mutex); out: return ret; - } +} static void mptsas_parse_device_info(struct sas_identify *identify, diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 3dd973475125..0ea141ece19e 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -603,7 +603,7 @@ static struct uni_table_desc *nx_get_table_desc(const u8 *unirom, int section) static int netxen_nic_validate_header(struct netxen_adapter *adapter) - { +{ const u8 *unirom = adapter->fw->data; struct uni_table_desc *directory = (struct uni_table_desc *) &unirom[0]; u32 fw_file_size = adapter->fw->size; diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index bd438062a6db..baedc7186b10 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -196,7 +196,7 @@ ath_tid_pull(struct ath_atx_tid *tid) } return skb; - } +} static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid) { diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 5a681962899c..4c38904a8a32 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct eeepc_laptop *eeepc) * potentially bad time, such as a timer interrupt. */ static void tpd_led_update(struct work_struct *work) - { +{ struct eeepc_laptop *eeepc; eeepc = container_of(work, struct eeepc_laptop, tpd_led_work); diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c index a319bf1e49de..ef5c16dfabfa 100644 --- a/drivers/rtc/rtc-ab-b5ze-s3.c +++ b/drivers/rtc/rtc-ab-b5ze-s3.c @@ -648,7 +648,7 @@ static int abb5zes3_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) ret); return ret; - } +} /* Enable or disable battery low irq generation */ static inline int _abb5zes3_rtc_battery_low_irq_enable(struct regmap *regmap, diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index fd172b0890d3..a00d822e3142 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba) #endif return ret; - } +} /*============================================================================ diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 791a2182de53..7320d5fe4cbc 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit, scsi_host_put(shost); return NULL; - } +} /* diff --git a/fs/locks.c b/fs/locks.c index 21b4dfa289ee..d2399d001afe 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -559,7 +559,7 @@ static const struct lock_manager_operations lease_manager_ops = { * Initialize a lease, use the default lock manager operations */ static int lease_init(struct file *filp, long type, struct file_lock *fl) - { +{ if (assign_type(fl, type) != 0) return -EINVAL; diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index dae9eb7c441e..d2fb97b173da 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c @@ -398,7 +398,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file, static int ocfs2_control_do_setversion_msg(struct file *file, struct ocfs2_control_message_setv *msg) - { +{ long major, minor; char *ptr = NULL; struct ocfs2_control_private *p = file->private_data; diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 0da80019a917..217108f765d5 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2401,7 +2401,7 @@ static bool xfs_agf_verify( struct xfs_mount *mp, struct xfs_buf *bp) - { +{ struct xfs_agf *agf = XFS_BUF_TO_AGF(bp); if (xfs_sb_version_hascrc(&mp->m_sb)) { @@ -2449,8 +2449,7 @@ xfs_agf_verify( be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)) return false; - return true;; - + return true; } static void diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c index fe1bfee35898..7d5c355d78b5 100644 --- a/fs/xfs/xfs_export.c +++ b/fs/xfs/xfs_export.c @@ -122,7 +122,7 @@ xfs_nfs_get_inode( struct super_block *sb, u64 ino, u32 generation) - { +{ xfs_mount_t *mp = XFS_M(sb); xfs_inode_t *ip; int error; diff --git a/kernel/audit.c b/kernel/audit.c index 227db99b0f19..d97e8f0f73ca 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -443,15 +443,15 @@ static int audit_set_failure(u32 state) * Drop any references inside the auditd connection tracking struct and free * the memory. */ - static void auditd_conn_free(struct rcu_head *rcu) - { +static void auditd_conn_free(struct rcu_head *rcu) +{ struct auditd_connection *ac; ac = container_of(rcu, struct auditd_connection, rcu); put_pid(ac->pid); put_net(ac->net); kfree(ac); - } +} /** * auditd_set - Set/Reset the auditd connection state diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index ad1d6164e946..50f44b7b2b32 100644 --- a/kernel/trace/trace_printk.c +++ b/kernel/trace/trace_printk.c @@ -196,7 +196,7 @@ struct notifier_block module_trace_bprintk_format_nb = { }; int __trace_bprintk(unsigned long ip, const char *fmt, ...) - { +{ int ret; va_list ap; @@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...) EXPORT_SYMBOL_GPL(__trace_bprintk); int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap) - { +{ if (unlikely(!fmt)) return 0; diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c index 1d2276b007ee..8191e1d0d2fb 100644 --- a/lib/raid6/sse2.c +++ b/lib/raid6/sse2.c @@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int disks, size_t bytes, void **ptrs) static void raid6_sse21_xor_syndrome(int disks, int start, int stop, size_t bytes, void **ptrs) - { +{ u8 **dptr = (u8 **)ptrs; u8 *p, *q; int d, z, z0; @@ -200,9 +200,9 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) kernel_fpu_end(); } - static void raid6_sse22_xor_syndrome(int disks, int start, int stop, +static void raid6_sse22_xor_syndrome(int disks, int start, int stop, size_t bytes, void **ptrs) - { +{ u8 **dptr = (u8 **)ptrs; u8 *p, *q; int d, z, z0; @@ -265,7 +265,7 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs) asm volatile("sfence" : : : "memory"); kernel_fpu_end(); - } +} const struct raid6_calls raid6_sse2x2 = { raid6_sse22_gen_syndrome, @@ -366,9 +366,9 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) kernel_fpu_end(); } - static void raid6_sse24_xor_syndrome(int disks, int start, int stop, +static void raid6_sse24_xor_syndrome(int disks, int start, int stop, size_t bytes, void **ptrs) - { +{ u8 **dptr = (u8 **)ptrs; u8 *p, *q; int d, z, z0; @@ -471,7 +471,7 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs) } asm volatile("sfence" : : : "memory"); kernel_fpu_end(); - } +} const struct raid6_calls raid6_sse2x4 = { diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 0c11f434a374..ec619f51d336 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -879,7 +879,7 @@ static const struct snd_pcm_ops fsl_dma_ops = { }; static int fsl_soc_dma_probe(struct platform_device *pdev) - { +{ struct dma_object *dma; struct device_node *np = pdev->dev.of_node; struct device_node *ssi_np;
Some functions definitions have either the initial open brace and/or the closing brace outside of column 1. Move those braces to column 1. This allows various function analyzers like gnu complexity to work properly for these modified functions. Miscellanea: o Remove extra trailing ; and blank line from xfs_agf_verify Signed-off-by: Joe Perches <joe@perches.com> --- git diff -w shows no difference other than the above 'Miscellanea' (this is against -next, but it applies against Linus' tree with a couple offsets) arch/x86/include/asm/atomic64_32.h | 2 +- drivers/acpi/custom_method.c | 2 +- drivers/acpi/fan.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/media/i2c/msp3400-kthreads.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 2 +- drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- drivers/scsi/dpt_i2o.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- fs/locks.c | 2 +- fs/ocfs2/stack_user.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 5 ++--- fs/xfs/xfs_export.c | 2 +- kernel/audit.c | 6 +++--- kernel/trace/trace_printk.c | 4 ++-- lib/raid6/sse2.c | 14 +++++++------- sound/soc/fsl/fsl_dma.c | 2 +- 20 files changed, 30 insertions(+), 31 deletions(-)