staging: greybus: Remove unnecessary braces
Subsystems (5)
Staging Greybus Greybus audio protocols drivers Greybus SDIO/GPIO/SPI protocols drivers +1 more subsystems
PATCH 3/6 staging: greybus: Remove unnecessary braces
This patch removes braces for single statement blocks. The warning was detected using checkpatch.pl.
Coccinelle was used to make the change.
@@
expression e,e1;
@@
- if (e) {
+ if (e)
e1;
- }
Signed-off-by simran singhal <[email protected]>
--- drivers/staging/greybus/audio_manager_sysfs.c | 3 +-- drivers/staging/greybus/audio_topology.c | 9 +++------ drivers/staging/greybus/bootrom.c | 6 ++---- drivers/staging/greybus/control.c | 3 +-- drivers/staging/greybus/es2.c | 3 +-- drivers/staging/greybus/gpio.c | 6 ++---- drivers/staging/greybus/manifest.c | 3 +-- drivers/staging/greybus/module.c | 3 +-- drivers/staging/greybus/svc.c | 9 +++------ 9 files changed, 15 insertions(+), 30 deletions(-)
drivers/staging/greybus/audio_manager_sysfs.c +1 -2
@@ -88,10 +88,9 @@ static void manager_sysfs_init_attribute(int err; err =sysfs_create_file (kobj, &kattr->attr); -if (err) { +if (err)pr_warn ("creating the sysfs entry for %s failed: %d\n" , kattr->attr.name, err); - } }void gb_audio_manager_sysfs_init (struct kobject *kobj)
drivers/staging/greybus/audio_topology.c +3 -6
@@ -327,10 +327,9 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle); -if (ret) { +if (ret)dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name); - }return ret; }
@@ -637,10 +636,9 @@ static int gbcodec_enum_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle); -if (ret) { +if (ret)dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name); - }return ret; }
@@ -837,11 +835,10 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle); -if (ret) { +if (ret)dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name); - }for (wi =0 ; wi < wlist->num_widgets; wi++) { widget = wlist->widgets[wi];
drivers/staging/greybus/bootrom.c +2 -4
@@ -176,10 +176,9 @@ static int find_firmware(struct gb_bootrom *bootrom, u8 stage) rc =request_firmware (&bootrom->fw, firmware_name, &connection->bundle->dev); -if (rc) { +if (rc)dev_err (&connection->bundle->dev,"failed to find %s firmware (%d)\n" , firmware_name, rc); - }return rc; }
@@ -226,11 +225,10 @@ static int gb_bootrom_firmware_size_request(struct gb_operation *op)mutex_unlock (&bootrom->mutex); queue_work: -if (!ret) { +if (!ret)/* Refresh timeout */ gb_bootrom_set_timeout (bootrom,NEXT_REQ_GET_FIRMWARE ,NEXT_REQ_TIMEOUT_MS ); - }return ret; }
drivers/staging/greybus/control.c +1 -2
@@ -167,10 +167,9 @@ int gb_control_disconnecting_operation(struct gb_control *control, request->cport_id =cpu_to_le16 (cport_id); ret =gb_operation_request_send_sync (operation); -if (ret) { +if (ret)dev_err (&control->dev,"failed to send disconnecting: %d\n" , ret); - }gb_operation_put (operation);
drivers/staging/greybus/es2.c +1 -2
@@ -1019,10 +1019,9 @@ static int arpc_sync(struct es2_ap_dev *es2, u8 type, void *payload,spin_unlock_irqrestore (&es2->arpc_lock, flags);arpc_free (rpc); -if (retval <0 && retval != -EREMOTEIO ) { +if (retval <0 && retval != -EREMOTEIO )dev_err (&es2->usb_dev->dev,"failed to execute ARPC: %d\n" , retval); - }return retval; }
drivers/staging/greybus/gpio.c +2 -4
@@ -125,10 +125,9 @@ static int gb_gpio_get_direction_operation(struct gb_gpio_controller *ggc,return ret; direction = response.direction; -if (direction && direction !=1 ) { +if (direction && direction !=1 )dev_warn (dev,"gpio %u direction was %u (should be 0 or 1)\n" , which, direction); - } ggc->lines[which].direction = direction ?1 :0 ;return 0 ; }
@@ -181,10 +180,9 @@ static int gb_gpio_get_value_operation(struct gb_gpio_controller *ggc, } value = response.value; -if (value && value !=1 ) { +if (value && value !=1 )dev_warn (dev,"gpio %u value was %u (should be 0 or 1)\n" , which, value); - } ggc->lines[which].value = value ?1 :0 ;return 0 ; }
drivers/staging/greybus/manifest.c +1 -2
@@ -152,11 +152,10 @@ static int identify_descriptor(struct gb_interface *intf, }/* Descriptor bigger than what we expect */ -if (desc_size > expected_size) { +if (desc_size > expected_size)dev_warn (&intf->dev,"%s descriptor size mismatch (want %zu got %zu)\n" ,get_descriptor_type_string (desc_header->type), expected_size, desc_size); - } descriptor =kzalloc (sizeof (*descriptor),GFP_KERNEL );if (!descriptor)
drivers/staging/greybus/module.c +1 -2
@@ -148,11 +148,10 @@ static void gb_module_register_interface(struct gb_interface *intf) ret =gb_interface_activate (intf);if (ret) { -if (intf->type !=GB_INTERFACE_TYPE_DUMMY ) { +if (intf->type !=GB_INTERFACE_TYPE_DUMMY )dev_err (&module->dev,"failed to activate interface %u: %d\n" , intf_id, ret); - }gb_interface_add (intf); goto err_unlock;
drivers/staging/greybus/svc.c +3 -6
@@ -512,10 +512,9 @@ void gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id, ret =gb_operation_sync (connection,GB_SVC_TYPE_CONN_DESTROY , &request,sizeof (request),NULL ,0 ); -if (ret) { +if (ret)dev_err (&svc->dev,"failed to destroy connection (%u:%u %u:%u): %d\n" , intf1_id, cport1_id, intf2_id, cport2_id, ret); - } }/* Creates bi-directional routes between the devices */
@@ -544,10 +543,9 @@ void gb_svc_route_destroy(struct gb_svc *svc, u8 intf1_id, u8 intf2_id) ret =gb_operation_sync (svc->connection,GB_SVC_TYPE_ROUTE_DESTROY , &request,sizeof (request),NULL ,0 ); -if (ret) { +if (ret)dev_err (&svc->dev,"failed to destroy route (%u %u): %d\n" , intf1_id, intf2_id, ret); - } } int gb_svc_intf_set_power_mode(struct gb_svc *svc, u8 intf_id, u8 hs_series,
@@ -960,10 +958,9 @@ static void gb_svc_process_module_inserted(struct gb_operation *operation)dev_dbg (&svc->dev,"%s - id = %u, num_interfaces = %zu, flags = 0x%04x\n" , __func__, module_id, num_interfaces, flags); -if (flags &GB_SVC_MODULE_INSERTED_FLAG_NO_PRIMARY ) { +if (flags &GB_SVC_MODULE_INSERTED_FLAG_NO_PRIMARY )dev_warn (&svc->dev,"no primary interface detected on module %u\n" , module_id); - } module =gb_svc_module_lookup (svc, module_id);if (module) {
Signature · 1 line
2.7.4