Skip to content

Commit

Permalink
treewide: Align function definition open/close braces
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Joe Perches <[email protected]>
Acked-by: Andy Shevchenko <[email protected]>
Acked-by: Paul Moore <[email protected]>
Acked-by: Alex Deucher <[email protected]>
Acked-by: Dave Chinner <[email protected]>
Reviewed-by: Darrick J. Wong <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
Acked-by: Martin K. Petersen <[email protected]>
Acked-by: Takashi Iwai <[email protected]>
Acked-by: Mauro Carvalho Chehab <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
Acked-by: Nicolin Chen <[email protected]>
Acked-by: Martin K. Petersen <[email protected]>
Acked-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
  • Loading branch information
JoePerches authored and Jiri Kosina committed Mar 26, 2018
1 parent 3215b9d commit 447a564
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/atomic64_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/custom_method.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/acpi/fan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/display/dc/core/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/i2c/msp3400-kthreads.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/message/fusion/mptsas.c
Original file line number Diff line number Diff line change
Expand Up @@ -2967,7 +2967,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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath9k/xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ ath_tid_pull(struct ath_atx_tid *tid)
}

return skb;
}
}


static bool ath_tid_has_buffered(struct ath_atx_tid *tid)
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/eeepc-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/rtc/rtc-ab-b5ze-s3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/dpt_i2o.c
Original file line number Diff line number Diff line change
Expand Up @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba)
#endif

return ret;
}
}


/*============================================================================
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sym53c8xx_2/sym_glue.c
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit,
scsi_host_put(shost);

return NULL;
}
}


/*
Expand Down
2 changes: 1 addition & 1 deletion fs/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion fs/ocfs2/stack_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_export.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions kernel/audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions kernel/trace/trace_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand Down
14 changes: 7 additions & 7 deletions lib/raid6/sse2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/fsl/fsl_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 447a564

Please sign in to comment.