From 60fb3405c73ea0bbab942c699496123f9e987c04 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Fri, 10 Jun 2016 14:59:07 +0530 Subject: [PATCH] greybus: Remove extra blank lines This patch removes few blank lines across the repository at places where two blank lines were present together or when a blank line is present at the start or end of a routine. Note that this doesn't remove most of them from greybus_protocols.h as they were added on purpose. Signed-off-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/audio_codec.c | 1 - drivers/staging/greybus/audio_module.c | 2 -- drivers/staging/greybus/audio_topology.c | 1 - drivers/staging/greybus/bundle.c | 1 - drivers/staging/greybus/connection.c | 1 - drivers/staging/greybus/gpio.c | 1 - drivers/staging/greybus/hid.c | 1 - drivers/staging/greybus/power_supply.c | 3 --- drivers/staging/greybus/pwm.c | 1 - drivers/staging/greybus/spilib.c | 1 - drivers/staging/greybus/svc.c | 1 - drivers/staging/greybus/uart.c | 3 --- 12 files changed, 17 deletions(-) diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index 2feac6beea57..45e12b1d8627 100644 --- a/drivers/staging/greybus/audio_codec.c +++ b/drivers/staging/greybus/audio_codec.c @@ -1164,7 +1164,6 @@ static struct snd_soc_codec_driver soc_codec_dev_gbaudio = { .ignore_pmdown_time = 1, }; - #ifdef CONFIG_PM static int gbaudio_codec_suspend(struct device *dev) { diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c index 81001329aad2..d87b9985a0e2 100644 --- a/drivers/staging/greybus/audio_module.c +++ b/drivers/staging/greybus/audio_module.c @@ -221,7 +221,6 @@ static int gb_audio_probe(struct gb_bundle *bundle, int ret, i; struct gb_audio_topology *topology; - /* There should be at least one Management and one Data cport */ if (bundle->num_cports < 2) return -ENODEV; @@ -367,7 +366,6 @@ static void gb_audio_disconnect(struct gb_bundle *bundle) struct gbaudio_module_info *gbmodule = greybus_get_drvdata(bundle); struct gbaudio_data_connection *dai, *_dai; - /* cleanup module related resources first */ gbaudio_unregister_module(gbmodule); diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c index 1e0768670b69..1f9e8b6178dd 100644 --- a/drivers/staging/greybus/audio_topology.c +++ b/drivers/staging/greybus/audio_topology.c @@ -872,7 +872,6 @@ static int gbaudio_tplg_process_routes(struct gbaudio_module_info *module, if (!dapm_routes) return -ENOMEM; - module->dapm_routes = dapm_routes; curr = routes; diff --git a/drivers/staging/greybus/bundle.c b/drivers/staging/greybus/bundle.c index c1c3d67a0279..80f54c977509 100644 --- a/drivers/staging/greybus/bundle.c +++ b/drivers/staging/greybus/bundle.c @@ -56,7 +56,6 @@ static ssize_t state_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RW(state); - static struct attribute *bundle_attrs[] = { &dev_attr_bundle_class.attr, &dev_attr_bundle_id.attr, diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index e0ee82f45de1..28076d014177 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -513,7 +513,6 @@ gb_connection_control_disconnected(struct gb_connection *connection) return; } - ret = gb_control_disconnected_operation(control, cport_id); if (ret) { dev_warn(&connection->bundle->dev, diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c index f60cc1da9f05..deae2658c7a8 100644 --- a/drivers/staging/greybus/gpio.c +++ b/drivers/staging/greybus/gpio.c @@ -556,7 +556,6 @@ static void gb_gpio_irqchip_remove(struct gb_gpio_controller *ggc) } } - /** * gb_gpio_irqchip_add() - adds an irqchip to a gpio chip * @chip: the gpio chip to add the irqchip to diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index fd4a7e096450..ca0c94949c6b 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -116,7 +116,6 @@ static int gb_hid_request_handler(struct gb_operation *op) return 0; } - static int gb_hid_report_len(struct hid_report *report) { return ((report->size - 1) >> 3) + 1 + diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c index 8d6570d1bb61..e96c24da007b 100644 --- a/drivers/staging/greybus/power_supply.c +++ b/drivers/staging/greybus/power_supply.c @@ -290,7 +290,6 @@ static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy) goto out_put_operation; } - /* Store available properties */ for (i = 0; i < gbpsy->properties_count; i++) { gbpsy->props[i].prop = resp->props[i].property; @@ -512,7 +511,6 @@ static int property_is_writeable(struct power_supply *b, return is_psy_prop_writeable(gbpsy, psp); } - #ifndef CORE_OWNS_PSY_STRUCT static int gb_power_supply_register(struct gb_power_supply *gbpsy) { @@ -562,7 +560,6 @@ static void _gb_power_supply_free(struct gb_power_supply *gbpsy) static void _gb_power_supply_release(struct gb_power_supply *gbpsy) { - gbpsy->update_interval = 0; cancel_delayed_work_sync(&gbpsy->work); diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c index 713123231251..1438b2e12cee 100644 --- a/drivers/staging/greybus/pwm.c +++ b/drivers/staging/greybus/pwm.c @@ -80,7 +80,6 @@ static int gb_pwm_config_operation(struct gb_pwm_chip *pwmc, &request, sizeof(request), NULL, 0); } - static int gb_pwm_set_polarity_operation(struct gb_pwm_chip *pwmc, u8 which, u8 polarity) { diff --git a/drivers/staging/greybus/spilib.c b/drivers/staging/greybus/spilib.c index 79ae044b78f3..527909b26d79 100644 --- a/drivers/staging/greybus/spilib.c +++ b/drivers/staging/greybus/spilib.c @@ -383,7 +383,6 @@ static void gb_spi_cleanup(struct spi_device *spi) /* Nothing to do for now */ } - /* Routines to get controller information */ /* diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c index cee058fe5188..d467ceb0916d 100644 --- a/drivers/staging/greybus/svc.c +++ b/drivers/staging/greybus/svc.c @@ -44,7 +44,6 @@ static ssize_t ap_intf_id_show(struct device *dev, } static DEVICE_ATTR_RO(ap_intf_id); - // FIXME // This is a hack, we need to do this "right" and clean the interface up // properly, not just forcibly yank the thing out of the system and hope for the diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 7460bdbd0a1a..6260569b2f25 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -597,7 +597,6 @@ static void gb_tty_throttle(struct tty_struct *tty) gb_tty->ctrlout &= ~GB_UART_CTRL_RTS; retval = send_control(gb_tty, gb_tty->ctrlout); } - } static void gb_tty_unthrottle(struct tty_struct *tty) @@ -710,7 +709,6 @@ static int wait_serial_change(struct gb_tty *gb_tty, unsigned long arg) } while (!retval); return retval; - } static int get_serial_usage(struct gb_tty *gb_tty, @@ -924,7 +922,6 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev, goto exit_connection_disable; } - return 0; exit_connection_disable: -- 2.39.5