Staging: most: several warnings fix reported by sparse
Subsystems (2)
v5 cover Staging: most: several warnings fix reported by sparse
This patch series fix several warnings reported by the Sparse tool
v2: Fixed patch format and comments as noted by
Greg Kroah-Hartman and clear a few more warnings
v3: Fixed patch format as noted by Greg Kroah-Hartman
v4: Fixed patch format as noted by Greg Kroah-Hartman
v5: Because of using a non-updated tree previously two patches did not apply
Adrian Remonda (5):
Staging: most: mostcore/core.c. Fix "missing static keyword" warnings
Staging: most: mostcore/core.c. Fix "Using plain integer as NULL
pointer" warnings
Staging: most: hdm-usb/hdm_usb.c. Fix "missing static keyword"
warnings
Staging: most: hdm-dim2/dim2_hal.c. Fix "Using plain integer as NULL
pointer" warnings
Staging: most: aim-cdev/cdev.c. Fix "missing static keyword" warnings
drivers/staging/most/aim-cdev/cdev.c | 18 +++++++++--------- drivers/staging/most/hdm-dim2/dim2_hal.c | 2 +- drivers/staging/most/hdm-usb/hdm_usb.c | 16 ++++++++-------- drivers/staging/most/mostcore/core.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-)
Signature · 1 line
2.1.4
PATCH v5 1/5 Staging: most: mostcore/core.c. Fix "missing static keyword" warnings
This is a patch to the mostcore/core.c file. It makes several local functions and structures static to prevent global visibility.
--- drivers/staging/most/mostcore/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/most/mostcore/core.c +7 -7
@@ -178,7 +178,7 @@ static void most_free_mbo_coherent(struct mbo *mbo)* flush_channel_fifos - clear the channel fifos * @c: pointer to channel object */ -void flush_channel_fifos (struct most_c_obj *c) +static void flush_channel_fifos (struct most_c_obj *c) {unsigned long flags, hf_flags;struct mbo *mbo, *tmp;
@@ -888,7 +888,7 @@ static ssize_t show_add_link(struct most_aim_obj *aim_obj,* Input: "mdev0:ch0@ep_81" * Output: *a -> "mdev0", *b -> "ch0@ep_81", *c == NULL */ -int split_string (char *buf,char **a,char **b,char **c) +static int split_string (char *buf,char **a,char **b,char **c) { *a =strsep (&buf,":" );if (!*a)
@@ -1006,7 +1006,7 @@ static ssize_t store_add_link(struct most_aim_obj *aim_obj,return len; } -struct most_aim_attribute most_aim_attr_add_link = +static struct most_aim_attribute most_aim_attr_add_link =__ATTR (add_link,S_IRUGO |S_IWUSR , show_add_link, store_add_link); static ssize_t show_remove_link(struct most_aim_obj *aim_obj,
@@ -1057,7 +1057,7 @@ static ssize_t store_remove_link(struct most_aim_obj *aim_obj,return len; } -struct most_aim_attribute most_aim_attr_remove_link = +static struct most_aim_attribute most_aim_attr_remove_link =__ATTR (remove_link,S_IRUGO |S_IWUSR , show_remove_link, store_remove_link);static struct attribute *most_aim_def_attrs[] = {
@@ -1121,14 +1121,14 @@ static void destroy_most_aim_obj(struct most_aim_obj *p)/** * Instantiation of the MOST bus */ -struct bus_type most_bus = { +static struct bus_type most_bus = { .name ="most" , };/** * Instantiation of the core driver */ -struct device_driver mostcore = { +static struct device_driver mostcore = { .name ="mostcore" , .bus = &most_bus, };
@@ -1255,7 +1255,7 @@ static void arm_mbo(struct mbo *mbo)* * Returns the number of allocated and enqueued MBOs. */ -int arm_mbo_chain (struct most_c_obj *c,int dir,void (*compl)(struct mbo *)) +static int arm_mbo_chain (struct most_c_obj *c,int dir,void (*compl)(struct mbo *)) {unsigned int i;int retval;
Signature · 1 line
2.1.4
PATCH v5 2/5 Staging: most: mostcore/core.c. Fix "Using plain integer as NULL pointer" warnings
This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0 with NULL.
--- drivers/staging/most/mostcore/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/mostcore/core.c +1 -1
@@ -982,7 +982,7 @@ static ssize_t store_add_link(struct most_aim_obj *aim_obj,if (ret)return ret; -if (mdev_devnod ==0 || *mdev_devnod ==0 ) { +if (mdev_devnod ==NULL || *mdev_devnod ==0 ) {snprintf (devnod_buf,sizeof (devnod_buf),"%s-%s" , mdev, mdev_ch); mdev_devnod = devnod_buf; }
Signature · 1 line
2.1.4
PATCH v5 3/5 Staging: most: hdm-usb/hdm_usb.c. Fix "missing static keyword" warnings
This is a patch to the most/hdm-usb/hdm_usb.c file. It makes several local functions and structures static to prevent global visibility.
--- drivers/staging/most/hdm-usb/hdm_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/most/hdm-usb/hdm_usb.c +8 -8
@@ -290,7 +290,7 @@ static unsigned int get_stream_frame_size(struct most_channel_config *cfg)* * Returns 0 on success or error code otherwise. */ -int hdm_poison_channel (struct most_interface *iface,int channel) +static int hdm_poison_channel (struct most_interface *iface,int channel) {struct most_dev *mdev;
@@ -328,7 +328,7 @@ int hdm_poison_channel(struct most_interface *iface, int channel)* This inserts the INIC hardware specific padding bytes into a streaming * channel's buffer */ -int hdm_add_padding (struct most_dev *mdev,int channel,struct mbo *mbo) +static int hdm_add_padding (struct most_dev *mdev,int channel,struct mbo *mbo) {struct most_channel_config *conf = &mdev->conf[channel];unsigned int j, num_frames, frame_size;
@@ -365,7 +365,7 @@ int hdm_add_padding(struct most_dev *mdev, int channel, struct mbo *mbo)* This takes the INIC hardware specific padding bytes off a streaming * channel's buffer. */ -int hdm_remove_padding (struct most_dev *mdev,int channel,struct mbo *mbo) +static int hdm_remove_padding (struct most_dev *mdev,int channel,struct mbo *mbo) {unsigned int j, num_frames, frame_size;struct most_channel_config *const conf = &mdev->conf[channel];
@@ -644,7 +644,7 @@ static void hdm_read_completion(struct urb *urb)* * Context: Could in _some_ cases be interrupt! */ -int hdm_enqueue (struct most_interface *iface,int channel,struct mbo *mbo) +static int hdm_enqueue (struct most_interface *iface,int channel,struct mbo *mbo) {struct most_dev *mdev;struct buf_anchor *anchor;
@@ -743,8 +743,8 @@ _error:* @channel: channel ID * @conf: structure that holds the configuration information */ -int hdm_configure_channel (struct most_interface *iface,int channel, -struct most_channel_config *conf) +static int hdm_configure_channel (struct most_interface *iface,int channel, +struct most_channel_config *conf) {unsigned int num_frames;unsigned int frame_size;
@@ -824,7 +824,7 @@ exit:* This triggers the USB vendor requests to read the hardware address and * the current link status of the attached device. */ -int hdm_update_netinfo (struct most_dev *mdev) +static int hdm_update_netinfo (struct most_dev *mdev) {struct device *dev = &mdev->usb_device->dev;int i;
@@ -873,7 +873,7 @@ int hdm_update_netinfo(struct most_dev *mdev)* polls for the NI state of the INIC every 2 seconds. * */ -void hdm_request_netinfo (struct most_interface *iface,int channel) +static void hdm_request_netinfo (struct most_interface *iface,int channel) {struct most_dev *mdev;
Signature · 1 line
2.1.4
PATCH v5 4/5 Staging: most: hdm-dim2/dim2_hal.c. Fix "Using plain integer as NULL pointer" warnings
This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0 with NULL.
--- drivers/staging/most/hdm-dim2/dim2_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -1
@@ -889,7 +889,7 @@ struct dim_ch_state_t *DIM_GetChannelState(struct dim_channel *ch, struct dim_ch_state_t *state_ptr) {if (!ch || !state_ptr) -return 0 ; +return NULL ; state_ptr->ready = ch->state.level <2 ; state_ptr->done_buffers = ch->done_sw_buffers_number;
Signature · 1 line
2.1.4
PATCH v5 5/5 Staging: most: aim-cdev/cdev.c. Fix "missing static keyword" warnings
This is a patch to the most/aim_cdev.c file. It makes several local functions and structures static to prevent global visibility.
--- drivers/staging/most/aim-cdev/cdev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/most/aim-cdev/cdev.c +9 -9
@@ -49,7 +49,7 @@ static struct list_head channel_list;static spinlock_t ch_list_lock; -struct aim_channel *get_channel (struct most_interface *iface,int id) +static struct aim_channel *get_channel (struct most_interface *iface,int id) {struct aim_channel *channel, *tmp;unsigned long flags;
@@ -289,7 +289,7 @@ static const struct file_operations channel_fops = {* This frees allocated memory and removes the cdev that represents this * channel in user space. */ -int aim_disconnect_channel (struct most_interface *iface,int channel_id) +static int aim_disconnect_channel (struct most_interface *iface,int channel_id) {struct aim_channel *channel;unsigned long flags;
@@ -329,7 +329,7 @@ int aim_disconnect_channel(struct most_interface *iface, int channel_id)* This searches for the channel linked to this MBO and stores it in the local * fifo buffer. */ -int aim_rx_completion (struct mbo *mbo) +static int aim_rx_completion (struct mbo *mbo) {struct aim_channel *channel;
@@ -356,7 +356,7 @@ int aim_rx_completion(struct mbo *mbo)* * This wakes sleeping processes in the wait-queue. */ -int aim_tx_completion (struct most_interface *iface,int channel_id) +static int aim_tx_completion (struct most_interface *iface,int channel_id) {struct aim_channel *channel;
@@ -376,7 +376,7 @@ int aim_tx_completion(struct most_interface *iface, int channel_id)return 0 ; } -struct most_aim cdev_aim; +static struct most_aim cdev_aim;/** * aim_probe - probe function of the driver module
@@ -390,9 +390,9 @@ struct most_aim cdev_aim;* * Returns 0 on success or error code otherwise. */ -int aim_probe (struct most_interface *iface,int channel_id, -struct most_channel_config *cfg, -struct kobject *parent,char *name) +static int aim_probe (struct most_interface *iface,int channel_id, +struct most_channel_config *cfg, +struct kobject *parent,char *name) {struct aim_channel *channel;unsigned long cl_flags;
@@ -463,7 +463,7 @@ error_alloc_channel:return retval; } -struct most_aim cdev_aim = { +static struct most_aim cdev_aim = { .name ="cdev" , .probe_channel = aim_probe, .disconnect_channel = aim_disconnect_channel,
Signature · 1 line
2.1.4
Christian Gromm
maintainerRe: [PATCHv5 3/5] Staging: most: hdm-usb/hdm_usb.c. Fix "missing static keyword" warnings
In reply to Adrian RemondaQuoted 50 lines · On Tue, 4 Aug 2015 20:44:53 +0200 Adrian Remonda <[email protected]>…
This is a patch to the
most/hdm-usb/hdm_usb.cfile. It makes several local functions and structures static to prevent global visibility.Signed-off-by Adrian Remonda <[email protected]>--- drivers/staging/most/hdm-usb/hdm_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/staging/most/hdm-usb/hdm_usb.c +4
-4@@ -290,7 +290,7 @@ static unsigned int get_stream_frame_size(struct most_channel_config *cfg)* * Returns 0 on success or error code otherwise. */ -int hdm_poison_channel (struct most_interface *iface,int channel) +static int hdm_poison_channel (struct most_interface *iface,int channel) {struct most_dev *mdev;@@ -328,7 +328,7 @@ int hdm_poison_channel(struct most_interface *iface, int channel)* This inserts the INIC hardware specific padding bytes into a streaming * channel's buffer */ -int hdm_add_padding (struct most_dev *mdev,int channel,struct mbo *mbo) +static int hdm_add_padding (struct most_dev *mdev,int channel,struct mbo *mbo) {struct most_channel_config *conf = &mdev->conf[channel];unsigned int j, num_frames, frame_size;@@ -365,7 +365,7 @@ int hdm_add_padding(struct most_dev *mdev, int channel, struct mbo *mbo)* This takes the INIC hardware specific padding bytes off a streaming * channel's buffer. */ -int hdm_remove_padding (struct most_dev *mdev,int channel,struct mbo *mbo) +static int hdm_remove_padding (struct most_dev *mdev,int channel,struct mbo *mbo) {unsigned int j, num_frames, frame_size;struct most_channel_config *const conf = &mdev->conf[channel];@@ -644,7 +644,7 @@ static void hdm_read_completion(struct urb *urb)* * Context: Could in _some_ cases be interrupt! */ -int hdm_enqueue (struct most_interface *iface,int channel,struct mbo *mbo) +static int hdm_enqueue (struct most_interface *iface,int channel,struct mbo *mbo) {struct most_dev *mdev;struct buf_anchor *anchor;
drivers/staging/most/hdm-usb/hdm_usb.c _error: · line 747
Quoted 7 lines
drivers/staging/most/hdm-usb/hdm_usb.c +2
-2@@ -743,8 +743,8 @@ _error:* @channel: channel ID * @conf: structure that holds the configuration information */ -int hdm_configure_channel (struct most_interface *iface,int channel, -struct most_channel_config *conf) +static int hdm_configure_channel (struct most_interface *iface,int channel, +struct most_channel_config *conf)
This is still not aligned.
regards,
Chris
Quoted 21 lines
drivers/staging/most/hdm-usb/hdm_usb.c +2
-2{unsigned int num_frames;unsigned int frame_size;@@ -824,7 +824,7 @@ exit:* This triggers the USB vendor requests to read the hardware address and * the current link status of the attached device. */ -int hdm_update_netinfo (struct most_dev *mdev) +static int hdm_update_netinfo (struct most_dev *mdev) {struct device *dev = &mdev->usb_device->dev;int i;@@ -873,7 +873,7 @@ int hdm_update_netinfo(struct most_dev *mdev)* polls for the NI state of the INIC every 2 seconds. * */ -void hdm_request_netinfo (struct most_interface *iface,int channel) +static void hdm_request_netinfo (struct most_interface *iface,int channel) {struct most_dev *mdev;
Re: [PATCHv5 2/5] Staging: most: mostcore/core.c. Fix "Using plain integer as NULL pointer" warnings
In reply to Adrian RemondaQuoted 13 lines · Adrian Remonda
This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0 with NULL.
Signed-off-by Adrian Remonda <[email protected]>--- drivers/staging/most/mostcore/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/most/mostcore/core.c +0
-0
drivers/staging/most/mostcore/core.c static ssize_t store_add_link(struct most_aim_obj *aim_obj, · line 985
Quoted 5 lines
drivers/staging/most/mostcore/core.c +1
-1@@ -982,7 +982,7 @@ static ssize_t store_add_link(struct most_aim_obj *aim_obj,if (ret)return ret; -if (mdev_devnod ==0 || *mdev_devnod ==0 ) { +if (mdev_devnod ==NULL || *mdev_devnod ==0 ) {
Usually we write the NULL test as:
if (!mdev_devnod || *mdev_devnod == 0)
regards
sudip
Re: [PATCHv5 1/5] Staging: most: mostcore/core.c. Fix "missing static keyword" warnings
In reply to Adrian RemondaQuoted 6 lines · Adrian Remonda
This is a patch to the
mostcore/core.cfile. It makes several local functions and structures static to prevent global visibility.Signed-off-by Adrian Remonda <[email protected]>---
<snip>
drivers/staging/most/mostcore/core.c static void arm_mbo(struct mbo *mbo) · line 1258
Quoted 6 lines
drivers/staging/most/mostcore/core.c +1
-1@@ -1255,7 +1255,7 @@ static void arm_mbo(struct mbo *mbo)* * Returns the number of allocated and enqueued MBOs. */ -int arm_mbo_chain (struct most_c_obj *c,int dir,void (*compl)(struct mbo *)) +static int arm_mbo_chain (struct most_c_obj *c,int dir,void (*compl)(struct mbo *))
This introduced a new checkpatch warning about "line over 80 characters".
regards
sudip