Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 461ab807 authored by Gioh Kim's avatar Gioh Kim Committed by Greg Kroah-Hartman
Browse files

staging: greybus: fix "line over 80 characters" coding style issues 



This patch fixes only obvious lines.
There are still more issues.

Signed-off-by: default avatarGioh Kim <gi-oh.kim@profitbricks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59d40901

drivers/staging/greybus/arche-apb-ctrl.c

+4 −1
Original line number Diff line number Diff line
@@ -168,7 +168,10 @@ static int standby_boot_seq(struct platform_device *pdev) 
	if (apb->init_disabled)

		return 0;



	/* Even if it is in OFF state, then we do not want to change the state */

	/*

	 * Even if it is in OFF state,

	 * then we do not want to change the state

	 */

	if (apb->state == ARCHE_PLATFORM_STATE_STANDBY ||

			apb->state == ARCHE_PLATFORM_STATE_OFF)

		return 0;

drivers/staging/greybus/arche-platform.c

+28 −15
Original line number Diff line number Diff line
@@ -312,9 +312,11 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid) 
		if (arche_pdata->wake_detect_state == WD_STATE_IDLE) {

			arche_pdata->wake_detect_start = jiffies;

			/*

			 * In the begining, when wake/detect goes low (first time), we assume

			 * it is meant for coldboot and set the flag. If wake/detect line stays low

			 * beyond 30msec, then it is coldboot else fallback to standby boot.

			 * In the begining, when wake/detect goes low

			 * (first time), we assume it is meant for coldboot

			 * and set the flag. If wake/detect line stays low

			 * beyond 30msec, then it is coldboot else fallback

			 * to standby boot.

			 */

			arche_platform_set_wake_detect_state(arche_pdata,

							     WD_STATE_BOOT_INIT);
@@ -330,7 +332,8 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid) 
/*

 * Requires arche_pdata->platform_state_mutex to be held

 */

static int arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdata)

static int

arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdata)

{

	int ret;
@@ -364,7 +367,8 @@ static int arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdat 
/*

 * Requires arche_pdata->platform_state_mutex to be held

 */

static int arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata)

static int

arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata)

{

	int ret;
@@ -398,7 +402,8 @@ static int arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_p 
/*

 * Requires arche_pdata->platform_state_mutex to be held

 */

static void arche_platform_poweroff_seq(struct arche_platform_drvdata *arche_pdata)

static void

arche_platform_poweroff_seq(struct arche_platform_drvdata *arche_pdata)

{

	unsigned long flags;
@@ -561,14 +566,17 @@ static int arche_platform_probe(struct platform_device *pdev) 
	struct device_node *np = dev->of_node;

	int ret;



	arche_pdata = devm_kzalloc(&pdev->dev, sizeof(*arche_pdata), GFP_KERNEL);

	arche_pdata = devm_kzalloc(&pdev->dev, sizeof(*arche_pdata),

				   GFP_KERNEL);

	if (!arche_pdata)

		return -ENOMEM;



	/* setup svc reset gpio */

	arche_pdata->is_reset_act_hi = of_property_read_bool(np,

					"svc,reset-active-high");

	arche_pdata->svc_reset_gpio = of_get_named_gpio(np, "svc,reset-gpio", 0);

	arche_pdata->svc_reset_gpio = of_get_named_gpio(np,

							"svc,reset-gpio",

							0);

	if (arche_pdata->svc_reset_gpio < 0) {

		dev_err(dev, "failed to get reset-gpio\n");

		return arche_pdata->svc_reset_gpio;
@@ -610,7 +618,8 @@ static int arche_platform_probe(struct platform_device *pdev) 
		dev_err(dev, "failed to get svc clock-req gpio\n");

		return arche_pdata->svc_refclk_req;

	}

	ret = devm_gpio_request(dev, arche_pdata->svc_refclk_req, "svc-clk-req");

	ret = devm_gpio_request(dev, arche_pdata->svc_refclk_req,

				"svc-clk-req");

	if (ret) {

		dev_err(dev, "failed to request svc-clk-req gpio: %d\n", ret);

		return ret;
@@ -634,13 +643,16 @@ static int arche_platform_probe(struct platform_device *pdev) 
	arche_pdata->num_apbs = of_get_child_count(np);

	dev_dbg(dev, "Number of APB's available - %d\n", arche_pdata->num_apbs);



	arche_pdata->wake_detect_gpio = of_get_named_gpio(np, "svc,wake-detect-gpio", 0);

	arche_pdata->wake_detect_gpio = of_get_named_gpio(np,

							  "svc,wake-detect-gpio",

							  0);

	if (arche_pdata->wake_detect_gpio < 0) {

		dev_err(dev, "failed to get wake detect gpio\n");

		return arche_pdata->wake_detect_gpio;

	}



	ret = devm_gpio_request(dev, arche_pdata->wake_detect_gpio, "wake detect");

	ret = devm_gpio_request(dev, arche_pdata->wake_detect_gpio,

				"wake detect");

	if (ret) {

		dev_err(dev, "Failed requesting wake_detect gpio %d\n",

				arche_pdata->wake_detect_gpio);
@@ -660,7 +672,8 @@ static int arche_platform_probe(struct platform_device *pdev) 
	ret = devm_request_threaded_irq(dev, arche_pdata->wake_detect_irq,

					arche_platform_wd_irq,

					arche_platform_wd_irq_thread,

			IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					IRQF_TRIGGER_FALLING |

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					dev_name(dev), arche_pdata);

	if (ret) {

		dev_err(dev, "failed to request wake detect IRQ %d\n", ret);

drivers/staging/greybus/audio_codec.c

+4 −1
Original line number Diff line number Diff line
@@ -838,7 +838,10 @@ int gbaudio_register_module(struct gbaudio_module_info *module) 
		snd_soc_dapm_link_component_dai_widgets(codec->card,

							&codec->dapm);

#ifdef CONFIG_SND_JACK

		/* register jack devices for this module from codec->jack_list */

		/*

		 * register jack devices for this module

		 * from codec->jack_list

		 */

		list_for_each_entry(jack, &codec->jack_list, list) {

			if ((jack == &module->headset_jack)

			    || (jack == &module->button_jack))

drivers/staging/greybus/bootrom.c

+8 −5
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ static void free_firmware(struct gb_bootrom *bootrom) 
static void gb_bootrom_timedout(struct work_struct *work)

{

	struct delayed_work *dwork = to_delayed_work(work);

	struct gb_bootrom *bootrom = container_of(dwork, struct gb_bootrom, dwork);

	struct gb_bootrom *bootrom = container_of(dwork,

						  struct gb_bootrom, dwork);

	struct device *dev = &bootrom->connection->bundle->dev;

	const char *reason;
@@ -187,7 +188,8 @@ static int find_firmware(struct gb_bootrom *bootrom, u8 stage) 
static int gb_bootrom_firmware_size_request(struct gb_operation *op)

{

	struct gb_bootrom *bootrom = gb_connection_get_data(op->connection);

	struct gb_bootrom_firmware_size_request *size_request = op->request->payload;

	struct gb_bootrom_firmware_size_request *size_request =

		op->request->payload;

	struct gb_bootrom_firmware_size_response *size_response;

	struct device *dev = &op->connection->bundle->dev;

	int ret;
@@ -220,7 +222,8 @@ static int gb_bootrom_firmware_size_request(struct gb_operation *op) 
	size_response = op->response->payload;

	size_response->size = cpu_to_le32(bootrom->fw->size);



	dev_dbg(dev, "%s: firmware size %d bytes\n", __func__, size_response->size);

	dev_dbg(dev, "%s: firmware size %d bytes\n",

		__func__, size_response->size);



unlock:

	mutex_unlock(&bootrom->mutex);
@@ -287,8 +290,8 @@ static int gb_bootrom_get_firmware(struct gb_operation *op) 
	firmware_response = op->response->payload;

	memcpy(firmware_response->data, fw->data + offset, size);



	dev_dbg(dev, "responding with firmware (offs = %u, size = %u)\n", offset,

		size);

	dev_dbg(dev, "responding with firmware (offs = %u, size = %u)\n",

		offset, size);



unlock:

	mutex_unlock(&bootrom->mutex);

drivers/staging/greybus/es2.c

+2 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,8 @@ static void apb_log_get(struct es2_ap_dev *es2, char *buf) 
		retval = usb_control_msg(es2->usb_dev,

					usb_rcvctrlpipe(es2->usb_dev, 0),

					GB_APB_REQUEST_LOG,

					USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,

					USB_DIR_IN | USB_TYPE_VENDOR |

					USB_RECIP_INTERFACE,

					0x00, 0x00,

					buf,

					APB1_LOG_MSG_SIZE,