Skip to content

Commit 77071bc

Browse files
torvaldstorvalds
committed
Merge tag 'media/v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: "A series of fixes for the media subsytem: - The largest amount of fixes in this series is with regards to comments that aren't kernel-doc, but start with "/**". A new check added for 4.15 makes it to produce a *huge* amount of new warnings (I'm compiling here with W=1). Most of the patches in this series fix those. No code changes - just comment changes at the source files - rc: some fixed in order to better handle RC repetition codes - v4l-async: use the v4l2_dev from the root notifier when matching sub-devices - v4l2-fwnode: Check subdev count after checking port - ov 13858 and et8ek8: compilation fix with randconfigs - usbtv: a trivial new USB ID addition - dibusb-common: don't do DMA on stack on firmware load - imx274: Fix error handling, add MAINTAINERS entry - sir_ir: detect presence of port" * tag 'media/v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (50 commits) media: imx274: Fix error handling, add MAINTAINERS entry media: v4l: async: use the v4l2_dev from the root notifier when matching sub-devices media: v4l2-fwnode: Check subdev count after checking port media: et8ek8: select V4L2_FWNODE media: ov13858: Select V4L2_FWNODE media: rc: partial revert of "media: rc: per-protocol repeat period" media: dvb: i2c transfers over usb cannot be done from stack media: dvb-frontends: complete kernel-doc markups media: docs: add documentation for frontend attach info media: dvb_frontends: fix kernel-doc macros media: drivers: remove "/**" from non-kernel-doc comments media: lm3560: add a missing kernel-doc parameter media: rcar_jpu: fix two kernel-doc markups media: vsp1: add a missing kernel-doc parameter media: soc_camera: fix a kernel-doc markup media: mt2063: fix some kernel-doc warnings media: radio-wl1273: fix a parameter name at kernel-doc macro media: s3c-camif: add missing description at s3c_camif_find_format() media: mtk-vpu: add description for wdt fields at struct mtk_vpu media: vdec: fix some kernel-doc warnings ...
2 parents 4066aa7 + 781b045 commit 77071bc

File tree

269 files changed

+3169
-2951
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+3169
-2951
lines changed

‎Documentation/media/dvb-drivers/frontends.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
****************
2+
Frontend drivers
3+
****************
4+
5+
Frontend attach headers
6+
***********************
7+
8+
.. Keep it on alphabetic order
9+
10+
.. kernel-doc:: drivers/media/dvb-frontends/a8293.h
11+
.. kernel-doc:: drivers/media/dvb-frontends/af9013.h
12+
.. kernel-doc:: drivers/media/dvb-frontends/ascot2e.h
13+
.. kernel-doc:: drivers/media/dvb-frontends/cxd2820r.h
14+
.. kernel-doc:: drivers/media/dvb-frontends/drxk.h
15+
.. kernel-doc:: drivers/media/dvb-frontends/dvb-pll.h
16+
.. kernel-doc:: drivers/media/dvb-frontends/helene.h
17+
.. kernel-doc:: drivers/media/dvb-frontends/horus3a.h
18+
.. kernel-doc:: drivers/media/dvb-frontends/ix2505v.h
19+
.. kernel-doc:: drivers/media/dvb-frontends/m88ds3103.h
20+
.. kernel-doc:: drivers/media/dvb-frontends/mb86a20s.h
21+
.. kernel-doc:: drivers/media/dvb-frontends/mn88472.h
22+
.. kernel-doc:: drivers/media/dvb-frontends/rtl2830.h
23+
.. kernel-doc:: drivers/media/dvb-frontends/rtl2832.h
24+
.. kernel-doc:: drivers/media/dvb-frontends/rtl2832_sdr.h
25+
.. kernel-doc:: drivers/media/dvb-frontends/stb6000.h
26+
.. kernel-doc:: drivers/media/dvb-frontends/tda10071.h
27+
.. kernel-doc:: drivers/media/dvb-frontends/tda826x.h
28+
.. kernel-doc:: drivers/media/dvb-frontends/zd1301_demod.h
29+
.. kernel-doc:: drivers/media/dvb-frontends/zl10036.h
30+

‎Documentation/media/dvb-drivers/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ For more details see the file COPYING in the source distribution of Linux.
4141
technisat
4242
ttusb-dec
4343
udev
44+
frontends
4445
contributors

‎MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12643,6 +12643,14 @@ S: Maintained
1264312643
F: drivers/ssb/
1264412644
F: include/linux/ssb/
1264512645

12646+
SONY IMX274 SENSOR DRIVER
12647+
M: Leon Luo <leonl@leopardimaging.com>
12648+
L: linux-media@vger.kernel.org
12649+
T: git git://linuxtv.org/media_tree.git
12650+
S: Maintained
12651+
F: drivers/media/i2c/imx274.c
12652+
F: Documentation/devicetree/bindings/media/i2c/imx274.txt
12653+
1264612654
SONY MEMORYSTICK CARD SUPPORT
1264712655
M: Alex Dubov <oakad@yahoo.com>
1264812656
W: http://tifmxx.berlios.de/

‎drivers/media/common/siano/smscoreapi.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -521,13 +521,13 @@ static void list_add_locked(struct list_head *new, struct list_head *head,
521521
spin_unlock_irqrestore(lock, flags);
522522
}
523523

524-
/**
524+
/*
525525
* register a client callback that called when device plugged in/unplugged
526526
* NOTE: if devices exist callback is called immediately for each device
527527
*
528528
* @param hotplug callback
529529
*
530-
* @return 0 on success, <0 on error.
530+
* return: 0 on success, <0 on error.
531531
*/
532532
int smscore_register_hotplug(hotplug_t hotplug)
533533
{
@@ -562,7 +562,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
562562
}
563563
EXPORT_SYMBOL_GPL(smscore_register_hotplug);
564564

565-
/**
565+
/*
566566
* unregister a client callback that called when device plugged in/unplugged
567567
*
568568
* @param hotplug callback
@@ -636,15 +636,15 @@ smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer,
636636
return cb;
637637
}
638638

639-
/**
639+
/*
640640
* creates coredev object for a device, prepares buffers,
641641
* creates buffer mappings, notifies registered hotplugs about new device.
642642
*
643643
* @param params device pointer to struct with device specific parameters
644644
* and handlers
645645
* @param coredev pointer to a value that receives created coredev object
646646
*
647-
* @return 0 on success, <0 on error.
647+
* return: 0 on success, <0 on error.
648648
*/
649649
int smscore_register_device(struct smsdevice_params_t *params,
650650
struct smscore_device_t **coredev,
@@ -764,10 +764,10 @@ static int smscore_sendrequest_and_wait(struct smscore_device_t *coredev,
764764
0 : -ETIME;
765765
}
766766

767-
/**
767+
/*
768768
* Starts & enables IR operations
769769
*
770-
* @return 0 on success, < 0 on error.
770+
* return: 0 on success, < 0 on error.
771771
*/
772772
static int smscore_init_ir(struct smscore_device_t *coredev)
773773
{
@@ -812,13 +812,13 @@ static int smscore_init_ir(struct smscore_device_t *coredev)
812812
return 0;
813813
}
814814

815-
/**
815+
/*
816816
* configures device features according to board configuration structure.
817817
*
818818
* @param coredev pointer to a coredev object returned by
819819
* smscore_register_device
820820
*
821-
* @return 0 on success, <0 on error.
821+
* return: 0 on success, <0 on error.
822822
*/
823823
static int smscore_configure_board(struct smscore_device_t *coredev)
824824
{
@@ -861,13 +861,13 @@ static int smscore_configure_board(struct smscore_device_t *coredev)
861861
return 0;
862862
}
863863

864-
/**
864+
/*
865865
* sets initial device mode and notifies client hotplugs that device is ready
866866
*
867867
* @param coredev pointer to a coredev object returned by
868868
* smscore_register_device
869869
*
870-
* @return 0 on success, <0 on error.
870+
* return: 0 on success, <0 on error.
871871
*/
872872
int smscore_start_device(struct smscore_device_t *coredev)
873873
{
@@ -1087,7 +1087,7 @@ static char *smscore_fw_lkup[][DEVICE_MODE_MAX] = {
10871087
},
10881088
};
10891089

1090-
/**
1090+
/*
10911091
* get firmware file name from one of the two mechanisms : sms_boards or
10921092
* smscore_fw_lkup.
10931093
* @param coredev pointer to a coredev object returned by
@@ -1096,7 +1096,7 @@ static char *smscore_fw_lkup[][DEVICE_MODE_MAX] = {
10961096
* @param lookup if 1, always get the fw filename from smscore_fw_lkup
10971097
* table. if 0, try first to get from sms_boards
10981098
*
1099-
* @return 0 on success, <0 on error.
1099+
* return: 0 on success, <0 on error.
11001100
*/
11011101
static char *smscore_get_fw_filename(struct smscore_device_t *coredev,
11021102
int mode)
@@ -1125,15 +1125,15 @@ static char *smscore_get_fw_filename(struct smscore_device_t *coredev,
11251125
return fw[mode];
11261126
}
11271127

1128-
/**
1128+
/*
11291129
* loads specified firmware into a buffer and calls device loadfirmware_handler
11301130
*
11311131
* @param coredev pointer to a coredev object returned by
11321132
* smscore_register_device
11331133
* @param filename null-terminated string specifies firmware file name
11341134
* @param loadfirmware_handler device handler that loads firmware
11351135
*
1136-
* @return 0 on success, <0 on error.
1136+
* return: 0 on success, <0 on error.
11371137
*/
11381138
static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
11391139
int mode,
@@ -1182,14 +1182,14 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
11821182
return rc;
11831183
}
11841184

1185-
/**
1185+
/*
11861186
* notifies all clients registered with the device, notifies hotplugs,
11871187
* frees all buffers and coredev object
11881188
*
11891189
* @param coredev pointer to a coredev object returned by
11901190
* smscore_register_device
11911191
*
1192-
* @return 0 on success, <0 on error.
1192+
* return: 0 on success, <0 on error.
11931193
*/
11941194
void smscore_unregister_device(struct smscore_device_t *coredev)
11951195
{
@@ -1282,14 +1282,14 @@ static int smscore_detect_mode(struct smscore_device_t *coredev)
12821282
return rc;
12831283
}
12841284

1285-
/**
1285+
/*
12861286
* send init device request and wait for response
12871287
*
12881288
* @param coredev pointer to a coredev object returned by
12891289
* smscore_register_device
12901290
* @param mode requested mode of operation
12911291
*
1292-
* @return 0 on success, <0 on error.
1292+
* return: 0 on success, <0 on error.
12931293
*/
12941294
static int smscore_init_device(struct smscore_device_t *coredev, int mode)
12951295
{
@@ -1315,15 +1315,15 @@ static int smscore_init_device(struct smscore_device_t *coredev, int mode)
13151315
return rc;
13161316
}
13171317

1318-
/**
1318+
/*
13191319
* calls device handler to change mode of operation
13201320
* NOTE: stellar/usb may disconnect when changing mode
13211321
*
13221322
* @param coredev pointer to a coredev object returned by
13231323
* smscore_register_device
13241324
* @param mode requested mode of operation
13251325
*
1326-
* @return 0 on success, <0 on error.
1326+
* return: 0 on success, <0 on error.
13271327
*/
13281328
int smscore_set_device_mode(struct smscore_device_t *coredev, int mode)
13291329
{
@@ -1411,21 +1411,21 @@ int smscore_set_device_mode(struct smscore_device_t *coredev, int mode)
14111411
return rc;
14121412
}
14131413

1414-
/**
1414+
/*
14151415
* calls device handler to get current mode of operation
14161416
*
14171417
* @param coredev pointer to a coredev object returned by
14181418
* smscore_register_device
14191419
*
1420-
* @return current mode
1420+
* return: current mode
14211421
*/
14221422
int smscore_get_device_mode(struct smscore_device_t *coredev)
14231423
{
14241424
return coredev->mode;
14251425
}
14261426
EXPORT_SYMBOL_GPL(smscore_get_device_mode);
14271427

1428-
/**
1428+
/*
14291429
* find client by response id & type within the clients list.
14301430
* return client handle or NULL.
14311431
*
@@ -1462,7 +1462,7 @@ smscore_client_t *smscore_find_client(struct smscore_device_t *coredev,
14621462
return client;
14631463
}
14641464

1465-
/**
1465+
/*
14661466
* find client by response id/type, call clients onresponse handler
14671467
* return buffer to pool on error
14681468
*
@@ -1615,13 +1615,13 @@ void smscore_onresponse(struct smscore_device_t *coredev,
16151615
}
16161616
EXPORT_SYMBOL_GPL(smscore_onresponse);
16171617

1618-
/**
1618+
/*
16191619
* return pointer to next free buffer descriptor from core pool
16201620
*
16211621
* @param coredev pointer to a coredev object returned by
16221622
* smscore_register_device
16231623
*
1624-
* @return pointer to descriptor on success, NULL on error.
1624+
* return: pointer to descriptor on success, NULL on error.
16251625
*/
16261626

16271627
static struct smscore_buffer_t *get_entry(struct smscore_device_t *coredev)
@@ -1648,7 +1648,7 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev)
16481648
}
16491649
EXPORT_SYMBOL_GPL(smscore_getbuffer);
16501650

1651-
/**
1651+
/*
16521652
* return buffer descriptor to a pool
16531653
*
16541654
* @param coredev pointer to a coredev object returned by
@@ -1693,7 +1693,7 @@ static int smscore_validate_client(struct smscore_device_t *coredev,
16931693
return 0;
16941694
}
16951695

1696-
/**
1696+
/*
16971697
* creates smsclient object, check that id is taken by another client
16981698
*
16991699
* @param coredev pointer to a coredev object from clients hotplug
@@ -1705,7 +1705,7 @@ static int smscore_validate_client(struct smscore_device_t *coredev,
17051705
* @param context client-specific context
17061706
* @param client pointer to a value that receives created smsclient object
17071707
*
1708-
* @return 0 on success, <0 on error.
1708+
* return: 0 on success, <0 on error.
17091709
*/
17101710
int smscore_register_client(struct smscore_device_t *coredev,
17111711
struct smsclient_params_t *params,
@@ -1740,7 +1740,7 @@ int smscore_register_client(struct smscore_device_t *coredev,
17401740
}
17411741
EXPORT_SYMBOL_GPL(smscore_register_client);
17421742

1743-
/**
1743+
/*
17441744
* frees smsclient object and all subclients associated with it
17451745
*
17461746
* @param client pointer to smsclient object returned by
@@ -1771,7 +1771,7 @@ void smscore_unregister_client(struct smscore_client_t *client)
17711771
}
17721772
EXPORT_SYMBOL_GPL(smscore_unregister_client);
17731773

1774-
/**
1774+
/*
17751775
* verifies that source id is not taken by another client,
17761776
* calls device handler to send requests to the device
17771777
*
@@ -1780,7 +1780,7 @@ EXPORT_SYMBOL_GPL(smscore_unregister_client);
17801780
* @param buffer pointer to a request buffer
17811781
* @param size size (in bytes) of request buffer
17821782
*
1783-
* @return 0 on success, <0 on error.
1783+
* return: 0 on success, <0 on error.
17841784
*/
17851785
int smsclient_sendrequest(struct smscore_client_t *client,
17861786
void *buffer, size_t size)

0 commit comments

Comments
 (0)