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

Commit e54d081d authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] staging: as102: Fix CodingStyle errors in file as102_fw.c 



Fix Linux kernel coding style (whitespace and indentation) errors
in file as102_fw.c. No functional changes.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarPiotr Chmura <chmooreck@poczta.onet.pl>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c6ccdca9

drivers/staging/media/as102/as102_fw.c

+58 −43
Original line number Diff line number Diff line 
/*

 * Abilis Systems Single DVB-T Receiver

 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>

 * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -31,7 +32,8 @@ char as102_st_fw2[] = "as102_data2_st.hex"; 
char as102_dt_fw1[] = "as102_data1_dt.hex";

char as102_dt_fw2[] = "as102_data2_dt.hex";



static unsigned char atohx(unsigned char *dst, char *src) {

static unsigned char atohx(unsigned char *dst, char *src)

{

	unsigned char value = 0;



	char msb = tolower(*src) - '0';
@@ -84,11 +86,10 @@ static int parse_hex_line(unsigned char *fw_data, unsigned char *addr, 
			break;

		case  4:

		case  5:

				if (*addr_has_changed) {

			if (*addr_has_changed)

				addr[(count - 4)] = dst;

				} else {

			else

				data[(count - 4)] = dst;

				}

			break;

		default:

			data[(count - 4)] = dst;
@@ -98,7 +99,7 @@ static int parse_hex_line(unsigned char *fw_data, unsigned char *addr, 
	}



	/* return read value + ':' + '\n' */

	return ((count * 2) + 2);

	return (count * 2) + 2;

}



static int as102_firmware_upload(struct as102_bus_adapter_t *bus_adap,
@@ -122,17 +123,20 @@ static int as102_firmware_upload(struct as102_bus_adapter_t *bus_adap, 
				&data_len,

				&addr_has_changed);



		if (read_bytes <= 0) {

		if (read_bytes <= 0)

			goto error;

		}



		/* detect the end of file */

		if ((total_read_bytes += read_bytes) == firmware->size) {

		total_read_bytes += read_bytes;

		if (total_read_bytes == firmware->size) {

			fw_pkt.u.request[0] = 0x00;

			fw_pkt.u.request[1] = 0x03;



			/* send EOF command */

			if ((errno = bus_adap->ops->upload_fw_pkt(bus_adap,(uint8_t *) &fw_pkt, 2, 0)) < 0)

			errno = bus_adap->ops->upload_fw_pkt(bus_adap,

							     (uint8_t *)

							     &fw_pkt, 2, 0);

			if (errno < 0)

				goto error;

		} else {

			if (!addr_has_changed) {
@@ -144,7 +148,12 @@ static int as102_firmware_upload(struct as102_bus_adapter_t *bus_adap, 
				data_len += sizeof(fw_pkt.raw.address);



				/* send cmd to device */

				if ((errno = bus_adap->ops->upload_fw_pkt(bus_adap, (uint8_t *) &fw_pkt, data_len, 0)) < 0)

				errno = bus_adap->ops->upload_fw_pkt(bus_adap,

								     (uint8_t *)

								     &fw_pkt,

								     data_len,

								     0);

				if (errno < 0)

					goto error;

			}

		}
@@ -154,7 +163,8 @@ static int as102_firmware_upload(struct as102_bus_adapter_t *bus_adap, 
	return (errno == 0) ? total_read_bytes : errno;

}



int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) {

int as102_fw_upload(struct as102_bus_adapter_t *bus_adap)

{

	int errno = -EFAULT;

	const struct firmware *firmware;

	unsigned char *cmd_buf = NULL;
@@ -179,20 +189,23 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) { 


#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)

	/* allocate buffer to store firmware upload command and data */

	if ((cmd_buf = kzalloc(MAX_FW_PKT_SIZE, GFP_KERNEL)) == NULL) {

	cmd_buf = kzalloc(MAX_FW_PKT_SIZE, GFP_KERNEL);

	if (cmd_buf == NULL) {

		errno = -ENOMEM;

		goto error;

	}



	/* request kernel to locate firmware file: part1 */

	if ((errno = request_firmware(&firmware, fw1, &dev->dev)) < 0) {

	errno = request_firmware(&firmware, fw1, &dev->dev);

	if (errno < 0) {

		printk(KERN_ERR "%s: unable to locate firmware file: %s\n",

				 DRIVER_NAME, fw1);

		goto error;

	}



	/* initiate firmware upload */

	if ((errno = as102_firmware_upload(bus_adap, cmd_buf, firmware)) < 0) {

	errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);

	if (errno < 0) {

		printk(KERN_ERR "%s: error during firmware upload part1\n",

				 DRIVER_NAME);

		goto error;
@@ -206,14 +219,16 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) { 
	mdelay(100);



	/* request kernel to locate firmware file: part2 */

	if ((errno = request_firmware(&firmware, fw2, &dev->dev)) < 0) {

	errno = request_firmware(&firmware, fw2, &dev->dev);

	if (errno < 0) {

		printk(KERN_ERR "%s: unable to locate firmware file: %s\n",

				 DRIVER_NAME, fw2);

		goto error;

	}



	/* initiate firmware upload */

	if ((errno = as102_firmware_upload(bus_adap, cmd_buf, firmware)) < 0) {

	errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);

	if (errno < 0) {

		printk(KERN_ERR "%s: error during firmware upload part2\n",

				 DRIVER_NAME);

		goto error;