The patch titled
Subject: treewide: align function definition open/close braces
has been removed from the -mm tree. Its filename was
treewide-align-function-definition-open-close-braces.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: treewide: align function definition open/close braces
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.
Link: http://lkml.kernel.org/r/5ccbbf083e26bddfb4ea4f819ed62347ce266f39.1521669820.git.joe@xxxxxxxxxxx
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Acked-by: Paul Moore <paul@xxxxxxxxxxxxxx>
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
Acked-by: Dave Chinner <dchinner@xxxxxxxxxx>
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
Acked-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Acked-by: Takashi Iwai <tiwai@xxxxxxx>
Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> [acpi]
Acked-by: Nicolin Chen <nicoleotsuka@xxxxxxxxx> [sound/soc/fsl/fsl_dma.c]
Acked-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> [drivers/scsi, drivers/message/fusion]
Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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/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 -
19 files changed, 28 insertions(+), 28 deletions(-)
diff -puN arch/x86/include/asm/atomic64_32.h~treewide-align-function-definition-open-close-braces arch/x86/include/asm/atomic64_32.h
--- a/arch/x86/include/asm/atomic64_32.h~treewide-align-function-definition-open-close-braces
+++ a/arch/x86/include/asm/atomic64_32.h
@@ -123,7 +123,7 @@ static inline long long arch_atomic64_re
long long r;
alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
return r;
- }
+}
/**
* arch_atomic64_add_return - add and return
diff -puN drivers/acpi/custom_method.c~treewide-align-function-definition-open-close-braces drivers/acpi/custom_method.c
--- a/drivers/acpi/custom_method.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/acpi/custom_method.c
@@ -97,7 +97,7 @@ static void __exit acpi_custom_method_ex
{
if (cm_dentry)
debugfs_remove(cm_dentry);
- }
+}
module_init(acpi_custom_method_init);
module_exit(acpi_custom_method_exit);
diff -puN drivers/acpi/fan.c~treewide-align-function-definition-open-close-braces drivers/acpi/fan.c
--- a/drivers/acpi/fan.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/acpi/fan.c
@@ -219,7 +219,7 @@ fan_set_cur_state(struct thermal_cooling
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 -puN drivers/gpu/drm/amd/display/dc/core/dc.c~treewide-align-function-definition-open-close-braces drivers/gpu/drm/amd/display/dc/core/dc.c
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -589,7 +589,7 @@ static void disable_dangling_plane(struc
******************************************************************************/
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 -puN drivers/media/i2c/msp3400-kthreads.c~treewide-align-function-definition-open-close-braces drivers/media/i2c/msp3400-kthreads.c
--- a/drivers/media/i2c/msp3400-kthreads.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/media/i2c/msp3400-kthreads.c
@@ -885,7 +885,7 @@ static int msp34xxg_modus(struct i2c_cli
}
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 -puN drivers/message/fusion/mptsas.c~treewide-align-function-definition-open-close-braces drivers/message/fusion/mptsas.c
--- a/drivers/message/fusion/mptsas.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/message/fusion/mptsas.c
@@ -2967,7 +2967,7 @@ out_unlock:
mutex_unlock(&ioc->sas_mgmt.mutex);
out:
return ret;
- }
+}
static void
mptsas_parse_device_info(struct sas_identify *identify,
diff -puN drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c~treewide-align-function-definition-open-close-braces drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -603,7 +603,7 @@ static struct uni_table_desc *nx_get_tab
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 -puN drivers/net/wireless/ath/ath9k/xmit.c~treewide-align-function-definition-open-close-braces drivers/net/wireless/ath/ath9k/xmit.c
--- a/drivers/net/wireless/ath/ath9k/xmit.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/net/wireless/ath/ath9k/xmit.c
@@ -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)
diff -puN drivers/platform/x86/eeepc-laptop.c~treewide-align-function-definition-open-close-braces drivers/platform/x86/eeepc-laptop.c
--- a/drivers/platform/x86/eeepc-laptop.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/platform/x86/eeepc-laptop.c
@@ -492,7 +492,7 @@ static void eeepc_platform_exit(struct e
* 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 -puN drivers/rtc/rtc-ab-b5ze-s3.c~treewide-align-function-definition-open-close-braces drivers/rtc/rtc-ab-b5ze-s3.c
--- a/drivers/rtc/rtc-ab-b5ze-s3.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/rtc/rtc-ab-b5ze-s3.c
@@ -646,7 +646,7 @@ static int abb5zes3_rtc_set_alarm(struct
ret);
return ret;
- }
+}
/* Enable or disable battery low irq generation */
static inline int _abb5zes3_rtc_battery_low_irq_enable(struct regmap *regmap,
diff -puN drivers/scsi/dpt_i2o.c~treewide-align-function-definition-open-close-braces drivers/scsi/dpt_i2o.c
--- a/drivers/scsi/dpt_i2o.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/scsi/dpt_i2o.c
@@ -3523,7 +3523,7 @@ static int adpt_i2o_systab_send(adpt_hba
#endif
return ret;
- }
+}
/*============================================================================
diff -puN drivers/scsi/sym53c8xx_2/sym_glue.c~treewide-align-function-definition-open-close-braces drivers/scsi/sym53c8xx_2/sym_glue.c
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c~treewide-align-function-definition-open-close-braces
+++ a/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(stru
scsi_host_put(shost);
return NULL;
- }
+}
/*
diff -puN fs/locks.c~treewide-align-function-definition-open-close-braces fs/locks.c
--- a/fs/locks.c~treewide-align-function-definition-open-close-braces
+++ a/fs/locks.c
@@ -559,7 +559,7 @@ static const struct lock_manager_operati
* 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 -puN fs/ocfs2/stack_user.c~treewide-align-function-definition-open-close-braces fs/ocfs2/stack_user.c
--- a/fs/ocfs2/stack_user.c~treewide-align-function-definition-open-close-braces
+++ a/fs/ocfs2/stack_user.c
@@ -398,7 +398,7 @@ static int ocfs2_control_do_setnode_msg(
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 -puN fs/xfs/xfs_export.c~treewide-align-function-definition-open-close-braces fs/xfs/xfs_export.c
--- a/fs/xfs/xfs_export.c~treewide-align-function-definition-open-close-braces
+++ a/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 -puN kernel/audit.c~treewide-align-function-definition-open-close-braces kernel/audit.c
--- a/kernel/audit.c~treewide-align-function-definition-open-close-braces
+++ a/kernel/audit.c
@@ -486,15 +486,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 -puN kernel/trace/trace_printk.c~treewide-align-function-definition-open-close-braces kernel/trace/trace_printk.c
--- a/kernel/trace/trace_printk.c~treewide-align-function-definition-open-close-braces
+++ a/kernel/trace/trace_printk.c
@@ -196,7 +196,7 @@ struct notifier_block module_trace_bprin
};
int __trace_bprintk(unsigned long ip, const char *fmt, ...)
- {
+{
int ret;
va_list ap;
@@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, co
EXPORT_SYMBOL_GPL(__trace_bprintk);
int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap)
- {
+{
if (unlikely(!fmt))
return 0;
diff -puN lib/raid6/sse2.c~treewide-align-function-definition-open-close-braces lib/raid6/sse2.c
--- a/lib/raid6/sse2.c~treewide-align-function-definition-open-close-braces
+++ a/lib/raid6/sse2.c
@@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int
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
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
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
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
}
asm volatile("sfence" : : : "memory");
kernel_fpu_end();
- }
+}
const struct raid6_calls raid6_sse2x4 = {
diff -puN sound/soc/fsl/fsl_dma.c~treewide-align-function-definition-open-close-braces sound/soc/fsl/fsl_dma.c
--- a/sound/soc/fsl/fsl_dma.c~treewide-align-function-definition-open-close-braces
+++ a/sound/soc/fsl/fsl_dma.c
@@ -886,7 +886,7 @@ static const struct snd_pcm_ops fsl_dma_
};
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;
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
checkpatch-improve-parse_email-signature-checking.patch
checkpatch-improve-get_quoted_string-for-trace_event-macros.patch
maintainers-update-bouncing-aacraid-adapteccom-addresses.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
