From 9ac23b344e72f21cc832c5f02744ab86e9210d12 Mon Sep 17 00:00:00 2001 From: Christian Gromm Date: Wed, 21 Oct 2015 17:50:39 +0200 Subject: [PATCH] staging: most: remove multiple blank lines This patch removes the usage of multiple blank lines from driver modules. Signed-off-by: Christian Gromm Signed-off-by: Greg Kroah-Hartman --- drivers/staging/most/aim-network/networking.c | 4 ---- drivers/staging/most/aim-sound/sound.c | 1 - drivers/staging/most/aim-v4l2/video.c | 6 ------ drivers/staging/most/hdm-dim2/dim2_hal.c | 9 --------- drivers/staging/most/hdm-i2c/hdm_i2c.c | 1 - drivers/staging/most/hdm-usb/hdm_usb.c | 1 - drivers/staging/most/mostcore/core.c | 6 ------ 7 files changed, 28 deletions(-) diff --git a/drivers/staging/most/aim-network/networking.c b/drivers/staging/most/aim-network/networking.c index 5f0ea9b79a3d..f268d7d63267 100644 --- a/drivers/staging/most/aim-network/networking.c +++ b/drivers/staging/most/aim-network/networking.c @@ -24,7 +24,6 @@ #include "mostcore.h" #include "networking.h" - #define MEP_HDR_LEN 8 #define MDP_HDR_LEN 16 #define MAMAC_DATA_LEN (1024 - MDP_HDR_LEN) @@ -47,8 +46,6 @@ #define HB(value) ((u8)((u16)(value) >> 8)) #define LB(value) ((u8)(value)) - - #define EXTRACT_BIT_SET(bitset_name, value) \ (((value) >> bitset_name##_SHIFT) & bitset_name##_MASK) @@ -81,7 +78,6 @@ static struct list_head net_devices = LIST_HEAD_INIT(net_devices); static struct spinlock list_lock; static struct most_aim aim; - static int skb_to_mamac(const struct sk_buff *skb, struct mbo *mbo) { u8 *buff = mbo->virt_address; diff --git a/drivers/staging/most/aim-sound/sound.c b/drivers/staging/most/aim-sound/sound.c index 4d3376340daa..9c645801cff4 100644 --- a/drivers/staging/most/aim-sound/sound.c +++ b/drivers/staging/most/aim-sound/sound.c @@ -470,7 +470,6 @@ static struct snd_pcm_ops pcm_ops = { .mmap = snd_pcm_lib_mmap_vmalloc, }; - static int split_arg_list(char *buf, char **card_name, char **pcm_format) { *card_name = strsep(&buf, "."); diff --git a/drivers/staging/most/aim-v4l2/video.c b/drivers/staging/most/aim-v4l2/video.c index 345a82437311..0d752580d809 100644 --- a/drivers/staging/most/aim-v4l2/video.c +++ b/drivers/staging/most/aim-v4l2/video.c @@ -29,7 +29,6 @@ #include "mostcore.h" - #define V4L2_AIM_MAX_INPUT 1 static struct most_aim aim_info; @@ -60,11 +59,9 @@ struct aim_fh { u32 offs; }; - static struct list_head video_devices = LIST_HEAD_INIT(video_devices); static struct spinlock list_lock; - static inline bool data_ready(struct most_video_dev *mdev) { return !list_empty(&mdev->pending_mbos); @@ -75,7 +72,6 @@ static inline struct mbo *get_top_mbo(struct most_video_dev *mdev) return list_first_entry(&mdev->pending_mbos, struct mbo, list); } - static int aim_vdev_open(struct file *filp) { int ret; @@ -276,7 +272,6 @@ static int aim_set_format(struct most_video_dev *mdev, unsigned int cmd, return 0; } - static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { @@ -496,7 +491,6 @@ static void aim_unregister_videodev(struct most_video_dev *mdev) video_unregister_device(mdev->vdev); } - static void aim_v4l2_dev_release(struct v4l2_device *v4l2_dev) { struct most_video_dev *mdev = diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/hdm-dim2/dim2_hal.c index 81dd8de57e4f..6440d0ab2af4 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hal.c +++ b/drivers/staging/most/hdm-dim2/dim2_hal.c @@ -19,7 +19,6 @@ #include "dim2_reg.h" #include - /* * The number of frames per sub-buffer for synchronous channels. * Allowed values: 1, 2, 4, 8, 16, 32, 64. @@ -51,7 +50,6 @@ */ #define DBR_MAP_SIZE 2 - /* -------------------------------------------------------------------------- */ /* not configurable area */ @@ -63,7 +61,6 @@ #define DBR_SIZE (16*1024) /* specified by IP */ #define DBR_BLOCK_SIZE (DBR_SIZE / 32 / DBR_MAP_SIZE) - /* -------------------------------------------------------------------------- */ /* generic helper functions and macros */ @@ -81,7 +78,6 @@ static inline bool dim_on_error(u8 error_id, const char *error_message) return false; } - /* -------------------------------------------------------------------------- */ /* types and local variables */ @@ -94,7 +90,6 @@ struct lld_global_vars_t { static struct lld_global_vars_t g = { false }; - /* -------------------------------------------------------------------------- */ static int dbr_get_mask_size(u16 size) @@ -327,7 +322,6 @@ static void dim2_start_isoc_sync(u8 ch_addr, u8 idx, u32 buf_addr, dim2_write_ctr_mask(ADT + ch_addr, mask, adt); } - static void dim2_clear_ctram(void) { u32 ctr_addr; @@ -530,7 +524,6 @@ static bool dim2_is_mlb_locked(void) (DIMCB_IoRead(&g.dim2->MLBC0) & mask0) != 0; } - /* -------------------------------------------------------------------------- */ /* channel help routines */ @@ -559,7 +552,6 @@ static inline bool service_channel(u8 ch_addr, u8 idx) return true; } - /* -------------------------------------------------------------------------- */ /* channel init routines */ @@ -671,7 +663,6 @@ static bool channel_detach_buffers(struct dim_channel *ch, u16 buffers_number) return true; } - /* -------------------------------------------------------------------------- */ /* API */ diff --git a/drivers/staging/most/hdm-i2c/hdm_i2c.c b/drivers/staging/most/hdm-i2c/hdm_i2c.c index 2cce1e572e48..8fe06acefdf3 100644 --- a/drivers/staging/most/hdm-i2c/hdm_i2c.c +++ b/drivers/staging/most/hdm-i2c/hdm_i2c.c @@ -35,7 +35,6 @@ enum { CH_RX, CH_TX, NUM_CHANNELS }; #define list_first_mbo(ptr) \ list_first_entry(ptr, struct mbo, list) - /* IRQ / Polling option */ static bool polling_req; module_param(polling_req, bool, S_IRUGO); diff --git a/drivers/staging/most/hdm-usb/hdm_usb.c b/drivers/staging/most/hdm-usb/hdm_usb.c index 0bf38c454362..a56df1386663 100644 --- a/drivers/staging/most/hdm-usb/hdm_usb.c +++ b/drivers/staging/most/hdm-usb/hdm_usb.c @@ -985,7 +985,6 @@ struct most_dci_attribute { }; #define to_dci_attr(a) container_of(a, struct most_dci_attribute, attr) - /** * dci_attr_show - show function for dci object * @kobj: pointer to kobject diff --git a/drivers/staging/most/mostcore/core.c b/drivers/staging/most/mostcore/core.c index 0efc3911aaa4..276ca24e5c8e 100644 --- a/drivers/staging/most/mostcore/core.c +++ b/drivers/staging/most/mostcore/core.c @@ -331,7 +331,6 @@ static ssize_t show_channel_starving(struct most_c_obj *c, return snprintf(buf, PAGE_SIZE, "%d\n", c->is_starving); } - #define create_show_channel_attribute(val) \ static MOST_CHNL_ATTR(val, S_IRUGO, show_##val, NULL) @@ -493,7 +492,6 @@ create_channel_attribute(set_datatype); create_channel_attribute(set_subbuffer_size); create_channel_attribute(set_packets_per_xact); - /** * most_channel_def_attrs - array of default attributes of channel object */ @@ -720,7 +718,6 @@ static struct kobj_type most_inst_ktype = { static struct kset *most_inst_kset; - /** * create_most_inst_obj - creates an instance object * @name: name of the object to be created @@ -784,7 +781,6 @@ struct most_aim_obj { static struct list_head aim_list; - /** * struct most_aim_attribute - to access the attributes of AIM object * @attr: attributes of an AIM @@ -1120,7 +1116,6 @@ static void destroy_most_aim_obj(struct most_aim_obj *p) kobject_put(&p->kobj); } - /* ___ ___ * ___C O R E___ */ @@ -1449,7 +1444,6 @@ struct mbo *most_get_mbo(struct most_interface *iface, int id, } EXPORT_SYMBOL_GPL(most_get_mbo); - /** * most_put_mbo - return buffer to pool * @mbo: buffer object -- 2.30.2