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

Commit 05ad412a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] siano: Fix the remaining checkpatch.pl compliants 



Fix all other remaining checkpatch.pl compliants on the Siano driver,
except for the 80-cols (soft) limit. Those are harder to fix, and
probably not worth to do right now.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 28a59df4

drivers/media/common/siano/smscoreapi.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -961,7 +961,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, 
	while (size && rc >= 0) {

	while (size && rc >= 0) {

		struct sms_data_download *data_msg =

		struct sms_data_download *data_msg =

			(struct sms_data_download *) msg;

			(struct sms_data_download *) msg;

		int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE);

		int payload_size = min_t(int, size, SMS_MAX_PAYLOAD_SIZE);





		SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_DOWNLOAD_REQ,

		SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_DOWNLOAD_REQ,

			     (u16)(sizeof(struct sms_msg_hdr) +

			     (u16)(sizeof(struct sms_msg_hdr) +
@@ -1225,8 +1225,7 @@ void smscore_unregister_device(struct smscore_device_t *coredev) 
		if (num_buffers == coredev->num_buffers)

		if (num_buffers == coredev->num_buffers)

			break;

			break;

		if (++retry > 10) {

		if (++retry > 10) {

			sms_info("exiting although "

			sms_info("exiting although not all buffers released.");

				 "not all buffers released.");

			break;

			break;

		}

		}
@@ -1279,8 +1278,8 @@ static int smscore_detect_mode(struct smscore_device_t *coredev) 
				coredev, msg, msg->msg_length,

				coredev, msg, msg->msg_length,

				&coredev->version_ex_done);

				&coredev->version_ex_done);

			if (rc < 0)

			if (rc < 0)

				sms_err("MSG_SMS_GET_VERSION_EX_REQ failed "

				sms_err("MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d",

					"second try, rc %d", rc);

					rc);

		} else

		} else

			rc = -ETIME;

			rc = -ETIME;

	}

	}

drivers/media/common/siano/smscoreapi.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -40,10 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 
#define kmutex_trylock(_p_) mutex_trylock(_p_)

#define kmutex_trylock(_p_) mutex_trylock(_p_)

#define kmutex_unlock(_p_) mutex_unlock(_p_)

#define kmutex_unlock(_p_) mutex_unlock(_p_)





#ifndef min

#define min(a, b) (((a) < (b)) ? (a) : (b))

#endif



/*

/*

 * Define the firmware names used by the driver.

 * Define the firmware names used by the driver.

 * Those should match what's used at smscoreapi.c and sms-cards.c

 * Those should match what's used at smscoreapi.c and sms-cards.c

drivers/media/common/siano/smsdvb-debugfs.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -509,8 +509,6 @@ void smsdvb_debugfs_release(struct smsdvb_client_t *client) 
	if (!client->debugfs)

	if (!client->debugfs)

		return;

		return;





printk("%s\n", __func__);



	client->prt_dvb_stats     = NULL;

	client->prt_dvb_stats     = NULL;

	client->prt_isdb_stats    = NULL;

	client->prt_isdb_stats    = NULL;

	client->prt_isdb_stats_ex = NULL;

	client->prt_isdb_stats_ex = NULL;
@@ -548,7 +546,6 @@ int smsdvb_debugfs_register(void) 




void smsdvb_debugfs_unregister(void)

void smsdvb_debugfs_unregister(void)

{

{

	if (smsdvb_debugfs_usb_root)

	debugfs_remove_recursive(smsdvb_debugfs_usb_root);

	debugfs_remove_recursive(smsdvb_debugfs_usb_root);

	smsdvb_debugfs_usb_root = NULL;

	smsdvb_debugfs_usb_root = NULL;

}
 
}