usb: gadget: uvc: make a bunch of stuff static
Subsystems (3)
PATCH 5/6 usb: gadget: uvc: make a bunch of stuff static
Sparse rightly complains that these things should be static since they are only used in the one .c file.
drivers/usb/gadget/function/uvc_configfs.c +19 -16
@@ -43,7 +43,8 @@ struct uvcg_control_header {unsigned linked; }; -struct uvcg_control_header *to_uvcg_control_header (struct config_item *item) +static struct uvcg_control_header *to_uvcg_control_header (struct config_item + *item) { return container_of(item, struct uvcg_control_header, item); }
@@ -135,7 +136,7 @@ static struct configfs_attribute *uvcg_control_header_attrs[] = { NULL, }; -struct config_item_type uvcg_control_header_type = { +static struct config_item_type uvcg_control_header_type = { .ct_item_ops = &uvcg_control_header_item_ops, .ct_attrs = uvcg_control_header_attrs, .ct_owner =THIS_MODULE ,
@@ -161,7 +162,7 @@ static struct config_item *uvcg_control_header_make(struct config_group *group,return &h->item; } -void uvcg_control_header_drop (struct config_group *group, +static void uvcg_control_header_drop (struct config_group *group,struct config_item *item) {struct uvcg_control_header *h =to_uvcg_control_header (item);
@@ -718,7 +719,7 @@ struct uvcg_format {__u8 bmaControls[UVCG_STREAMING_CONTROL_SIZE ]; }; -struct uvcg_format *to_uvcg_format (struct config_item *item) +static struct uvcg_format *to_uvcg_format (struct config_item *item) { return container_of(to_config_group(item), struct uvcg_format, group); }
@@ -795,7 +796,8 @@ struct uvcg_streaming_header {unsigned num_fmt; }; -struct uvcg_streaming_header *to_uvcg_streaming_header (struct config_item *item) +static struct uvcg_streaming_header *to_uvcg_streaming_header (struct config_item + *item) { return container_of(item, struct uvcg_streaming_header, item); }
@@ -947,7 +949,7 @@ static struct configfs_attribute *uvcg_streaming_header_attrs[] = { NULL, }; -struct config_item_type uvcg_streaming_header_type = { +static struct config_item_type uvcg_streaming_header_type = { .ct_item_ops = &uvcg_streaming_header_item_ops, .ct_attrs = uvcg_streaming_header_attrs, .ct_owner =THIS_MODULE ,
@@ -973,7 +975,7 @@ static struct config_itemreturn &h->item; } -void uvcg_streaming_header_drop (struct config_group *group, +static void uvcg_streaming_header_drop (struct config_group *group,struct config_item *item) {struct uvcg_streaming_header *h =to_uvcg_streaming_header (item);
@@ -1017,7 +1019,7 @@ struct uvcg_frame {struct config_item item; }; -struct uvcg_frame *to_uvcg_frame (struct config_item *item) +static struct uvcg_frame *to_uvcg_frame (struct config_item *item) { return container_of(item, struct uvcg_frame, item); }
@@ -1260,7 +1262,7 @@ static struct configfs_attribute *uvcg_frame_attrs[] = { NULL, }; -struct config_item_type uvcg_frame_type = { +static struct config_item_type uvcg_frame_type = { .ct_item_ops = &uvcg_frame_item_ops, .ct_attrs = uvcg_frame_attrs, .ct_owner =THIS_MODULE ,
@@ -1311,7 +1313,8 @@ static struct config_item *uvcg_frame_make(struct config_group *group,return &h->item; } -void uvcg_frame_drop (struct config_group *group,struct config_item *item) +static void uvcg_frame_drop (struct config_group *group, +struct config_item *item) {struct uvcg_frame *h =to_uvcg_frame (item);struct uvcg_format *fmt;
@@ -1334,7 +1337,7 @@ struct uvcg_uncompressed {struct uvc_format_uncompressed desc; }; -struct uvcg_uncompressed *to_uvcg_uncompressed (struct config_item *item) +static struct uvcg_uncompressed *to_uvcg_uncompressed (struct config_item *item) { return container_of( container_of(to_config_group(item), struct uvcg_format, group),
@@ -1544,7 +1547,7 @@ static struct configfs_attribute *uvcg_uncompressed_attrs[] = { NULL, }; -struct config_item_type uvcg_uncompressed_type = { +static struct config_item_type uvcg_uncompressed_type = { .ct_item_ops = &uvcg_uncompressed_item_ops, .ct_group_ops = &uvcg_uncompressed_group_ops, .ct_attrs = uvcg_uncompressed_attrs,
@@ -1582,7 +1585,7 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group,return &h->fmt.group; } -void uvcg_uncompressed_drop (struct config_group *group, +static void uvcg_uncompressed_drop (struct config_group *group,struct config_item *item) {struct uvcg_uncompressed *h =to_uvcg_uncompressed (item);
@@ -1606,7 +1609,7 @@ struct uvcg_mjpeg {struct uvc_format_mjpeg desc; }; -struct uvcg_mjpeg *to_uvcg_mjpeg (struct config_item *item) +static struct uvcg_mjpeg *to_uvcg_mjpeg (struct config_item *item) { return container_of( container_of(to_config_group(item), struct uvcg_format, group),
@@ -1757,7 +1760,7 @@ static struct configfs_attribute *uvcg_mjpeg_attrs[] = { NULL, }; -struct config_item_type uvcg_mjpeg_type = { +static struct config_item_type uvcg_mjpeg_type = { .ct_item_ops = &uvcg_mjpeg_item_ops, .ct_group_ops = &uvcg_mjpeg_group_ops, .ct_attrs = uvcg_mjpeg_attrs,
@@ -1789,7 +1792,7 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group,return &h->fmt.group; } -void uvcg_mjpeg_drop (struct config_group *group, +static void uvcg_mjpeg_drop (struct config_group *group,struct config_item *item) {struct uvcg_mjpeg *h =to_uvcg_mjpeg (item);
Quoted 4 lines · Dan Carpenter
Sparse rightly complains that these things should be static since they are only used in the one .c file.
Signed-off-by Dan Carpenter <[email protected]>
fails to apply on top of my testing/next
checking file drivers/usb/gadget/function/uvc_configfs.c Hunk #1 FAILED at 43.
Hunk #2 FAILED at 135.
Hunk #3 FAILED at 161.
Hunk #4 FAILED at 718.
Hunk #5 FAILED at 795.
Hunk #6 FAILED at 947.
Hunk #7 FAILED at 973.
Hunk #8 FAILED at 1017.
Hunk #9 FAILED at 1260.
Hunk #10 FAILED at 1311.
Hunk #11 FAILED at 1334.
Hunk #12 FAILED at 1544.
Hunk #13 FAILED at 1582.
Hunk #14 FAILED at 1606.
Hunk #15 FAILED at 1757.
Hunk #16 FAILED at 1789.
16 out of 16 hunks FAILED
please rebase on that branch.
Signature · 1 line
balbi
W dniu 14.01.2015 o 23:45, Felipe Balbi pisze:
Quoted 4 lines · Dan Carpenter
Quoted 3 lines
Sparse rightly complains that these things should be static since they are only used in the one .c file.
There has already been a patch for this:
http://www.spinics.net/lists/linux-usb/msg119646.html
Quoted 25 lines
Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>fails to apply on top of my testing/next
checking file
drivers/usb/gadget/function/uvc_configfs.cHunk #1 FAILED at 43.
Hunk #2 FAILED at 135.
Hunk #3 FAILED at 161.
Hunk #4 FAILED at 718.
Hunk #5 FAILED at 795.
Hunk #6 FAILED at 947.
Hunk #7 FAILED at 973.
Hunk #8 FAILED at 1017.
Hunk #9 FAILED at 1260.
Hunk #10 FAILED at 1311.
Hunk #11 FAILED at 1334.
Hunk #12 FAILED at 1544.
Hunk #13 FAILED at 1582.
Hunk #14 FAILED at 1606.
Hunk #15 FAILED at 1757.
Hunk #16 FAILED at 1789.
16 out of 16 hunks FAILEDplease rebase on that branch.