Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 05ad412a63d66175f8f5a3d08894cf3f1d118cbc

Authored by Mauro Carvalho Chehab
1 parent 28a59df4d7
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

[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: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 3 changed files with 9 additions and 17 deletions Side-by-side Diff

drivers/media/common/siano/smscoreapi.c
Diff comments   View file @ 05ad412
... ... @@ -57,8 +57,8 @@
57 57 struct list_head entry;
58 58 struct smscore_device_t *coredev;
59 59 void *context;
60   - struct list_head idlist;
61   - onresponse_t onresponse_handler;
  60 + struct list_head idlist;
  61 + onresponse_t onresponse_handler;
62 62 onremove_t onremove_handler;
63 63 };
64 64  
... ... @@ -874,7 +874,7 @@
874 874 * sets initial device mode and notifies client hotplugs that device is ready
875 875 *
876 876 * @param coredev pointer to a coredev object returned by
877   - * smscore_register_device
  877 + * smscore_register_device
878 878 *
879 879 * @return 0 on success, <0 on error.
880 880 */
... ... @@ -961,7 +961,7 @@
961 961 while (size && rc >= 0) {
962 962 struct sms_data_download *data_msg =
963 963 (struct sms_data_download *) msg;
964   - int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE);
  964 + int payload_size = min_t(int, size, SMS_MAX_PAYLOAD_SIZE);
965 965  
966 966 SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_DOWNLOAD_REQ,
967 967 (u16)(sizeof(struct sms_msg_hdr) +
... ... @@ -1225,8 +1225,7 @@
1225 1225 if (num_buffers == coredev->num_buffers)
1226 1226 break;
1227 1227 if (++retry > 10) {
1228   - sms_info("exiting although "
1229   - "not all buffers released.");
  1228 + sms_info("exiting although not all buffers released.");
1230 1229 break;
1231 1230 }
1232 1231  
... ... @@ -1279,8 +1278,8 @@
1279 1278 coredev, msg, msg->msg_length,
1280 1279 &coredev->version_ex_done);
1281 1280 if (rc < 0)
1282   - sms_err("MSG_SMS_GET_VERSION_EX_REQ failed "
1283   - "second try, rc %d", rc);
  1281 + sms_err("MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d",
  1282 + rc);
1284 1283 } else
1285 1284 rc = -ETIME;
1286 1285 }
drivers/media/common/siano/smscoreapi.h
Diff comments   View file @ 05ad412
... ... @@ -40,10 +40,6 @@
40 40 #define kmutex_trylock(_p_) mutex_trylock(_p_)
41 41 #define kmutex_unlock(_p_) mutex_unlock(_p_)
42 42  
43   -#ifndef min
44   -#define min(a, b) (((a) < (b)) ? (a) : (b))
45   -#endif
46   -
47 43 /*
48 44 * Define the firmware names used by the driver.
49 45 * Those should match what's used at smscoreapi.c and sms-cards.c
drivers/media/common/siano/smsdvb-debugfs.c
Diff comments   View file @ 05ad412
... ... @@ -112,7 +112,7 @@
112 112 "burst_cycle_time = %d\n", p->burst_cycle_time);
113 113 n += snprintf(&buf[n], PAGE_SIZE - n,
114 114 "calc_burst_cycle_time = %d\n",
115   - p->calc_burst_cycle_time);
  115 + p->calc_burst_cycle_time);
116 116 n += snprintf(&buf[n], PAGE_SIZE - n,
117 117 "num_of_rows = %d\n", p->num_of_rows);
118 118 n += snprintf(&buf[n], PAGE_SIZE - n,
... ... @@ -509,8 +509,6 @@
509 509 if (!client->debugfs)
510 510 return;
511 511  
512   -printk("%s\n", __func__);
513   -
514 512 client->prt_dvb_stats = NULL;
515 513 client->prt_isdb_stats = NULL;
516 514 client->prt_isdb_stats_ex = NULL;
... ... @@ -548,8 +546,7 @@
548 546  
549 547 void smsdvb_debugfs_unregister(void)
550 548 {
551   - if (smsdvb_debugfs_usb_root)
552   - debugfs_remove_recursive(smsdvb_debugfs_usb_root);
  549 + debugfs_remove_recursive(smsdvb_debugfs_usb_root);
553 550 smsdvb_debugfs_usb_root = NULL;
554 551 }