Re: [PATCH v3 1/2] media: v4l: Add definitions for the HEVC slice format and controls
Hi, On Tue, 2019-04-02 at 13:51 +0200, Hans Verkuil wrote: > On 2/14/19 10:53 AM, Paul Kocialkowski wrote: [...] > > +.. c:type:: v4l2_hevc_dpb_entry > > + > > +.. cssclass:: longtable > > + > > +.. flat-table:: struct v4l2_hevc_dpb_entry > > +:header-rows: 0 > > +:stub-columns: 0 > > +:widths: 1 1 2 > > + > > +* - __u32 > > + - ``buffer_tag`` > > + - The V4L2 buffer tag that matches the associated reference picture. > > This struct documentation is out of date with the actual struct! Woops, sorry about that. I'll make another pass on the structures vs docs before submitting the next version. > > +#define V4L2_HEVC_DPB_ENTRY_RPS_ST_CURR_BEFORE 0x01 > > +#define V4L2_HEVC_DPB_ENTRY_RPS_ST_CURR_AFTER 0x02 > > +#define V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR0x03 > > + > > +#define V4L2_HEVC_DPB_ENTRIES_NUM_MAX 16 > > + > > +struct v4l2_hevc_dpb_entry { > > + __u64 timestamp; > > I would call this 'reference_ts' rather than plain 'timestamp'. > Or at least some other name that reflects what the timestamp > refers to. Well, I think using "ts" instead of "timestamp" is much less explicit (I'm really not a big fan of abbreviations...). Also, this field is in the dpb entry structure and since a dpb entry describes a reference, I find it quite straightforward already without any added prefix. The prefix feels redundant with the name of the structure that holds the element. I think the same should apply for mpeg-2 and h.264. > > + __u8rps; > > + __u8field_pic; > > + __u16 pic_order_cnt[2]; > > + __u8padding[2]; > > padding fields here or elsewhere are not documented. Do you really > need them? What if you changed rps and field_pic to __u16 instead? > > Padding fields are painful to maintain in my experience. I think we'll need to rework the controls to include flags and such in the not-too-distant future. So there will be an occasion to change it then (the same work also needs to be done for MPEG-2). If you prefer that we make the change now and later update it along with the controls, I can definitely do that too. Cheers, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] media: cedrus: Fix initialization order
Hi, On Mon, 2019-04-08 at 10:18 +0200, Paul Kocialkowski wrote: > Hi, > > Le dimanche 07 avril 2019 à 20:47 +0200, Jernej Skrabec a écrit : > > Currently, MEDIA_IOC_G_TOPOLOGY ioctl on cedrus fails due to incorrect > > initialization order. Fix that by moving video_register_device() before > > v4l2_m2m_register_media_controller() and while at it, fix error path. > > > > Reported-by: Jonas Karlman > > Signed-off-by: Jernej Skrabec > > Thanks for the fix, good catch! > > Acked-by: Paul Kocialkowski Looks like this patch wasn't picked-up yet. Could we take it in? I think it would also deserve a: Fixes: 50e761516f2b ("media: platform: Add Cedrus VPU decoder driver") Cheers, Paul > > --- > > drivers/staging/media/sunxi/cedrus/cedrus.c | 24 ++--- > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c > > b/drivers/staging/media/sunxi/cedrus/cedrus.c > > index b98add3cdedd..d0429c0e6b6b 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > > @@ -300,7 +300,7 @@ static int cedrus_probe(struct platform_device *pdev) > > "Failed to initialize V4L2 M2M device\n"); > > ret = PTR_ERR(dev->m2m_dev); > > > > - goto err_video; > > + goto err_v4l2; > > } > > > > dev->mdev.dev = &pdev->dev; > > @@ -310,23 +310,23 @@ static int cedrus_probe(struct platform_device *pdev) > > dev->mdev.ops = &cedrus_m2m_media_ops; > > dev->v4l2_dev.mdev = &dev->mdev; > > > > - ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd, > > - > > MEDIA_ENT_F_PROC_VIDEO_DECODER); > > - if (ret) { > > - v4l2_err(&dev->v4l2_dev, > > -"Failed to initialize V4L2 M2M media controller\n"); > > - goto err_m2m; > > - } > > - > > ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0); > > if (ret) { > > v4l2_err(&dev->v4l2_dev, "Failed to register video device\n"); > > - goto err_v4l2; > > + goto err_m2m; > > } > > > > v4l2_info(&dev->v4l2_dev, > > "Device registered as /dev/video%d\n", vfd->num); > > > > + ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd, > > + > > MEDIA_ENT_F_PROC_VIDEO_DECODER); > > + if (ret) { > > + v4l2_err(&dev->v4l2_dev, > > +"Failed to initialize V4L2 M2M media controller\n"); > > + goto err_video; > > + } > > + > > ret = media_device_register(&dev->mdev); > > if (ret) { > > v4l2_err(&dev->v4l2_dev, "Failed to register media device\n"); > > @@ -339,10 +339,10 @@ static int cedrus_probe(struct platform_device *pdev) > > > > err_m2m_mc: > > v4l2_m2m_unregister_media_controller(dev->m2m_dev); > > -err_m2m: > > - v4l2_m2m_release(dev->m2m_dev); > > err_video: > > video_unregister_device(&dev->vfd); > > +err_m2m: > > + v4l2_m2m_release(dev->m2m_dev); > > err_v4l2: > > v4l2_device_unregister(&dev->v4l2_dev); > > -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: rtl8723bs: core: Replace rtw_malloc with kmalloc
Replace rtw_malloc with kmalloc to make code OS independent use kmalloc second argument as GFP_ATOMIC as these are called by functions that holds lock. Signed-off-by: Bhanusree Pola --- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index 18fabf5..6a6683c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -128,7 +128,7 @@ static void update_BCNTIM(struct adapter *padapter) } if (remainder_ielen > 0) { - pbackup_remainder_ie = rtw_malloc(remainder_ielen); + pbackup_remainder_ie = kmalloc(remainder_ielen,GFP_ATOMIC); if (pbackup_remainder_ie && premainder_ie) memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); } @@ -1686,7 +1686,7 @@ static void update_bcn_wps_ie(struct adapter *padapter) remainder_ielen = ielen - wps_offset - wps_ielen; if (remainder_ielen > 0) { - pbackup_remainder_ie = rtw_malloc(remainder_ielen); + pbackup_remainder_ie = kmalloc(remainder_ielen,GFP_ATOMIC); if (pbackup_remainder_ie) memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); } -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] Staging: rtl8723bs: Avoid typedefs for structure
Avoid typedefs for structure types to maintain kernel coding style. Remove typedefs for _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_. This part is done by the following semantic patch: @r1@ identifier i; type t; @@ typedef struct i { ... }t; @r2@ type r1.t; identifier v; @@ t v; @script:python match@ i << r1.i; x; @@ coccinelle.x = i; @r4@ identifier match.x; type r1.t; @@ - typedef struct x + struct x { ... } - t ; @r5@ type r1.t; identifier r2.v, match.x; @@ - t v; + struct x v; Change Structure name _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_ to maintain Linux kernel Coding Style. Replace occurences of ODM_PHY_DBG_INFO_T to odm_phy_dbg_info and ODM_MAC_INFO to odm_mac_status_info. Signed-off-by: Bhanusree Pola --- v2: Changed the occurence of (ODM_MAC_INFO *) to (struct odm_mac_status_info *) in the commented code drivers/staging/rtl8723bs/hal/odm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c index 7de5161..9db9f17 100644 --- a/drivers/staging/rtl8723bs/hal/odm.c +++ b/drivers/staging/rtl8723bs/hal/odm.c @@ -691,7 +691,7 @@ void ODM_CmnInfoHook(PDM_ODM_T pDM_Odm, ODM_CMNINFO_E CmnInfo, void *pValue) /* break; */ /* case ODM_CMNINFO_MAC_STATUS: */ - /* pDM_Odm->pMacInfo = (ODM_MAC_INFO *)pValue; */ + /* pDM_Odm->pMacInfo = (struct odm_mac_status_info *)pValue; */ /* break; */ /* To remove the compiler warning, must add an empty default statement to handle the other values. */ default: -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] Staging: rtl8723bs: Avoid typedefs for structure
On Fri, Apr 19, 2019 at 04:42:56PM +0530, Bhanusree Pola wrote: > Avoid typedefs for structure types to maintain kernel coding style. > Remove typedefs for _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_. > This part is done by the following semantic patch: > > > @r1@ > identifier i; > type t; > @@ > typedef struct i { > ... > }t; > > @r2@ > type r1.t; > identifier v; > @@ > t v; > > @script:python match@ > i << r1.i; > x; > @@ > coccinelle.x = i; > > @r4@ > identifier match.x; > type r1.t; > @@ > - typedef struct x > + struct x > { ... } > - t > ; > > @r5@ > type r1.t; > identifier r2.v, match.x; > @@ > - t v; > + struct x v; > > > Change Structure name _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_ to maintain > Linux kernel Coding Style. > Replace occurences of ODM_PHY_DBG_INFO_T to odm_phy_dbg_info and ODM_MAC_INFO > to odm_mac_status_info. > > Signed-off-by: Bhanusree Pola > --- > v2: > Changed the occurence of (ODM_MAC_INFO *) to (struct odm_mac_status_info *) > in the commented code > > drivers/staging/rtl8723bs/hal/odm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/rtl8723bs/hal/odm.c > b/drivers/staging/rtl8723bs/hal/odm.c > index 7de5161..9db9f17 100644 > --- a/drivers/staging/rtl8723bs/hal/odm.c > +++ b/drivers/staging/rtl8723bs/hal/odm.c > @@ -691,7 +691,7 @@ void ODM_CmnInfoHook(PDM_ODM_T pDM_Odm, ODM_CMNINFO_E > CmnInfo, void *pValue) > /* break; */ > > /* case ODM_CMNINFO_MAC_STATUS: */ > - /* pDM_Odm->pMacInfo = (ODM_MAC_INFO *)pValue; */ > + /* pDM_Odm->pMacInfo = (struct odm_mac_status_info *)pValue; */ > /* break; */ > /* To remove the compiler warning, must add an empty default statement > to handle the other values. */ > default: This patch doesn't really do anything at all, right? Are you sure you included the correct patch? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: rtl8723bs: core: Replace rtw_malloc with kmalloc
On Fri, Apr 19, 2019 at 03:52:43PM +0530, Bhanusree Pola wrote: > Replace rtw_malloc with kmalloc to make code OS independent > use kmalloc second argument as GFP_ATOMIC as these are called by functions > that holds lock. > > Signed-off-by: Bhanusree Pola > --- > drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c > b/drivers/staging/rtl8723bs/core/rtw_ap.c > index 18fabf5..6a6683c 100644 > --- a/drivers/staging/rtl8723bs/core/rtw_ap.c > +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c > @@ -128,7 +128,7 @@ static void update_BCNTIM(struct adapter *padapter) > } > > if (remainder_ielen > 0) { > - pbackup_remainder_ie = rtw_malloc(remainder_ielen); > + pbackup_remainder_ie = > kmalloc(remainder_ielen,GFP_ATOMIC); Always run checkpatch.pl on your patches so you do nto get grumpy maintainers telling you to run checkpatch.pl on your code :) Why not fix up all of the callers of this function? And are you sure that GFP_ATOMIC is the correct thing to do here? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH V2] staging: vc04_services: handle kzalloc failure
Am 19.04.19 um 01:31 schrieb Nicholas Mc Guire: > The kzalloc here was being used without checking the return - if the > kzalloc fails return VCHIQ_ERROR. The call-site of > vchiq_platform_init_state() vchiq_init_state() was not responding > to an allocation failure so checks for != VCHIQ_SUCCESS > and pass VCHIQ_ERROR up to vchiq_platform_init() which then > will fail with -EINVAL. > > Signed-off-by: Nicholas Mc Guire > Reported-by: kbuild test robot > --- Acked-By: Stefan Wahren ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3] Staging: rtl8723bs: Avoid typedefs for structure
Avoid typedefs for structure types to maintain kernel coding style. Remove typedefs for _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_. This part is done by the following semantic patch: @r1@ identifier i; type t; @@ typedef struct i { ... }t; @r2@ type r1.t; identifier v; @@ t v; @script:python match@ i << r1.i; x; @@ coccinelle.x = i; @r4@ identifier match.x; type r1.t; @@ - typedef struct x + struct x { ... } - t ; @r5@ type r1.t; identifier r2.v, match.x; @@ - t v; + struct x v; Change Structure name _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_ to maintain Linux kernel Coding Style. Replace occurences of ODM_PHY_DBG_INFO_T to odm_phy_dbg_info and ODM_MAC_INFO to odm_mac_status_info. Signed-off-by: Bhanusree Pola --- v2: Changed the occurence of (ODM_MAC_INFO *) to (struct odm_mac_status_info *) in the commented code v3: Included the correct patch drivers/staging/rtl8723bs/hal/odm.c | 2 +- drivers/staging/rtl8723bs/hal/odm.h | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c index 7de5161..9db9f17 100644 --- a/drivers/staging/rtl8723bs/hal/odm.c +++ b/drivers/staging/rtl8723bs/hal/odm.c @@ -691,7 +691,7 @@ void ODM_CmnInfoHook(PDM_ODM_T pDM_Odm, ODM_CMNINFO_E CmnInfo, void *pValue) /* break; */ /* case ODM_CMNINFO_MAC_STATUS: */ - /* pDM_Odm->pMacInfo = (ODM_MAC_INFO *)pValue; */ + /* pDM_Odm->pMacInfo = (struct odm_mac_status_info *)pValue; */ /* break; */ /* To remove the compiler warning, must add an empty default statement to handle the other values. */ default: diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index 23ab160..9f9259c 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -261,7 +261,7 @@ struct odm_packet_info { bool is_beacon; }; -typedef struct _ODM_Phy_Dbg_Info_ { +struct odm_phy_dbg_info { /* ODM Write, debug info */ s8 RxSNRdB[4]; u32 NumQryPhyStatus; @@ -271,11 +271,11 @@ typedef struct _ODM_Phy_Dbg_Info_ { /* Others */ s32 RxEVM[4]; -} ODM_PHY_DBG_INFO_T; +}; -typedef struct _ODM_Mac_Status_Info_ { +struct odm_mac_status_info { u8 test; -} ODM_MAC_INFO; +}; typedef enum tag_Dynamic_ODM_Support_Ability_Type { /* BB Team */ @@ -1092,11 +1092,11 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure { /* Define ... */ /* Latest packet phy info (ODM write) */ - ODM_PHY_DBG_INFO_T PhyDbgInfo; + struct odm_phy_dbg_info PhyDbgInfo; /* PHY_INFO_88E PhyInfo; */ /* Latest packet phy info (ODM write) */ - ODM_MAC_INFO *pMacInfo; + struct odm_mac_status_info *pMacInfo; /* MAC_INFO_88E MacInfo; */ /* Different Team independt structure?? */ -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[GIT PULL] Staging driver fixes for 5.1-rc6
The following changes since commit 79a3aaa7b82e3106be97842dedfd8429248896e6: Linux 5.1-rc3 (2019-03-31 14:39:29 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git tags/staging-5.1-rc6 for you to fetch changes up to af4b54a2e5ba18259ff9aac445bf546dd60d037e: staging: comedi: ni_usb6501: Fix possible double-free of ->usb_rx_buf (2019-04-17 11:59:24 +0200) Staging/IIO fixes for 5.1-rc6 Here is a bunch of IIO driver fixes, and some smaller staging driver fixes, for 5.1-rc6. The IIO fixes were delayed due to my vacation, but all resolve a number of reported issues and have been in linux-next for a few weeks with no reported issues. The other staging driver fixes are all tiny, resolving some reported issues in the comedi and most drivers, as well as some erofs fixes. All of these patches have been in linux-next with no reported issues. Signed-off-by: Greg Kroah-Hartman Arnd Bergmann (1): iio: pms7003: select IIO_TRIGGERED_BUFFER Christian Gromm (1): staging: most: core: use device description as name Dragos Bogdan (1): iio: ad_sigma_delta: select channel when reading register Fabrice Gasnier (1): iio: core: fix a possible circular locking dependency Gao Xiang (1): staging: erofs: fix unexpected out-of-bound data access Georg Ottinger (1): iio: adc: at91: disable adc channel interrupt in timeout case Greg Kroah-Hartman (1): Merge tag 'iio-fixes-for-5.1a' of git://git.kernel.org/.../jic23/iio into staging-linus Gwendal Grignou (1): iio: cros_ec: Fix the maths for gyro scale calculation Ian Abbott (4): staging: comedi: vmk80xx: Fix use of uninitialized semaphore staging: comedi: vmk80xx: Fix possible double-free of ->usb_rx_buf staging: comedi: ni_usb6501: Fix use of uninitialized mutex staging: comedi: ni_usb6501: Fix possible double-free of ->usb_rx_buf Jean-Francois Dagenais (1): iio: dac: mcp4725: add missing powerdown bits in store eeprom Jonathan Cameron (1): iio: chemical: fix missing Kconfig block for sgp30 Lars-Peter Clausen (1): iio: Fix scan mask selection Leonard Pollak (1): Staging: iio: meter: fixed typo Mike Looijmans (3): iio/gyro/bmg160: Use millidegrees for temperature scale iio:chemical:bme680: Fix, report temperature in millidegrees iio:chemical:bme680: Fix SPI read interface Mircea Caprioru (1): staging: iio: ad7192: Fix ad7193 channel address Sergey Larin (1): iio: gyro: mpu3050: fix chip ID reading Sven Van Asbroeck (3): iio: adc: xilinx: fix potential use-after-free on remove iio: adc: xilinx: fix potential use-after-free on probe iio: adc: xilinx: prevent touching unclocked h/w on remove he, bo (1): io: accel: kxcjk1013: restore the range after resume. drivers/iio/accel/kxcjk-1013.c | 2 + drivers/iio/adc/ad_sigma_delta.c | 1 + drivers/iio/adc/at91_adc.c | 28 +++-- drivers/iio/adc/xilinx-xadc-core.c | 3 +- drivers/iio/chemical/Kconfig | 14 +++ drivers/iio/chemical/bme680.h | 6 +- drivers/iio/chemical/bme680_core.c | 54 -- drivers/iio/chemical/bme680_i2c.c | 21 drivers/iio/chemical/bme680_spi.c | 115 ++--- .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 7 +- drivers/iio/dac/mcp4725.c | 1 + drivers/iio/gyro/bmg160_core.c | 6 +- drivers/iio/gyro/mpu3050-core.c| 8 +- drivers/iio/industrialio-buffer.c | 5 +- drivers/iio/industrialio-core.c| 4 +- drivers/staging/comedi/drivers/ni_usb6501.c| 10 +- drivers/staging/comedi/drivers/vmk80xx.c | 8 +- drivers/staging/erofs/data.c | 2 +- drivers/staging/iio/adc/ad7192.c | 8 +- drivers/staging/iio/meter/ade7854.c| 2 +- drivers/staging/most/core.c| 2 +- 21 files changed, 192 insertions(+), 115 deletions(-) ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 0/2] staging: speakup: factor out selection code
On Wed, Apr 17, 2019 at 01:21:12PM +0100, Okash Khawaja wrote: > Hi, > > The v2 renames set_selection() and do_set_selection() to following > more explicit names: > > set_selection_user() /* includes copying data from user space */ > set_selection_kernel() /* no copying from user space */ > > The patches also update references to set_selection() to be > set_selection_user(). > > Original intro: > > Speakup's selection functionality parallels that of > drivers/tty/vt/selection.c. This patch set replaces speakup's > implementation with calls to vt's selection code. This is one of the > remaining items in our TODO file and it's needed for moving speakup out > of staging. > > Please note that in speakup selection is set inside interrupt context of > keyboard handler. Set selection code in vt happens in process context > and hence expects ability to sleep. To address this, there were two > options: farm out speakup's set selection into a work_struct thread, or > create atomic version of vt's set_selection. These patches implement > the former option. Very nice, both now queued up! thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: rtl8723bs: core: Replace rtw_malloc with kmalloc
On Fri, 19 Apr 2019 at 16:52, Greg Kroah-Hartman wrote: > > On Fri, Apr 19, 2019 at 03:52:43PM +0530, Bhanusree Pola wrote: > > Replace rtw_malloc with kmalloc to make code OS independent > > use kmalloc second argument as GFP_ATOMIC as these are called by functions > > that holds lock. > > > > Signed-off-by: Bhanusree Pola > > --- > > drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c > > b/drivers/staging/rtl8723bs/core/rtw_ap.c > > index 18fabf5..6a6683c 100644 > > --- a/drivers/staging/rtl8723bs/core/rtw_ap.c > > +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c > > @@ -128,7 +128,7 @@ static void update_BCNTIM(struct adapter *padapter) > > } > > > > if (remainder_ielen > 0) { > > - pbackup_remainder_ie = rtw_malloc(remainder_ielen); > > + pbackup_remainder_ie = > > kmalloc(remainder_ielen,GFP_ATOMIC); > > Always run checkpatch.pl on your patches so you do nto get grumpy > maintainers telling you to run checkpatch.pl on your code :) > > Why not fix up all of the callers of this function? There are many callers of this function. Should I send the whole thing as of patch series? >And are you sure > that GFP_ATOMIC is the correct thing to do here? yes, because it is called by the function which holds the lock. correct me if I'm wrong. > > thanks, > > greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Dear
Dear, I am Mr.Marck Csady a solicitor at law, i need your assistance to represent my late client fund valued at $2.5 million dollars that his bank wants to comfiscate, You bear the same last name with my late client and he is also a national of your country. Please if you are interested to assist me then get back to me through my private email bellow. i will make all necessary informations known to you,including the name of the bank and modes to the repartriation of this fund. PLEASE REPLY THROUGH MY PRIVATE EMAIL ADDRESS Thanks for your understanding Marck Csady Esq. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: kpc2000: add initial set of Daktronics drivers
These drivers have been outside of the kernel tree since the 2.x days, and it's time to bring them into the tree so they can get properly cleaned up. This first dump of drivers is based on a tarball Matt gave to me, minus an odd "dma" driver that I could not get to build at all. I renamed a few files, added the proper SPDX lines to it, added Kconfig entries and tied it into the kernel build. I also fixed up a number of initial obvious kernel build warnings, but left the odd bitfield warning that gcc is spitting out, as I'm not quite sure what to do about that. There's loads of low-hanging coding style cleanups in here for people to start attacking, as well as the more obvious logic and api cleanups as well. Cc: Matt Sickler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/kpc2000/Kconfig | 46 ++ drivers/staging/kpc2000/Makefile | 5 + drivers/staging/kpc2000/TODO | 8 + drivers/staging/kpc2000/kpc.h | 23 + drivers/staging/kpc2000/kpc2000/Makefile | 4 + drivers/staging/kpc2000/kpc2000/cell_probe.c | 466 drivers/staging/kpc2000/kpc2000/core.c| 436 +++ .../staging/kpc2000/kpc2000/dma_common_defs.h | 43 ++ drivers/staging/kpc2000/kpc2000/fileops.c | 128 .../staging/kpc2000/kpc2000/kp2000_module.c | 55 ++ drivers/staging/kpc2000/kpc2000/pcie.h| 112 +++ drivers/staging/kpc2000/kpc2000/uapi.h| 22 + drivers/staging/kpc2000/kpc_i2c/Makefile | 4 + drivers/staging/kpc2000/kpc_i2c/fileops.c | 181 + drivers/staging/kpc2000/kpc_i2c/i2c_driver.c | 698 ++ drivers/staging/kpc2000/kpc_spi/Makefile | 4 + drivers/staging/kpc2000/kpc_spi/spi_driver.c | 507 + drivers/staging/kpc2000/kpc_spi/spi_parts.h | 48 ++ 20 files changed, 2793 insertions(+) create mode 100644 drivers/staging/kpc2000/Kconfig create mode 100644 drivers/staging/kpc2000/Makefile create mode 100644 drivers/staging/kpc2000/TODO create mode 100644 drivers/staging/kpc2000/kpc.h create mode 100644 drivers/staging/kpc2000/kpc2000/Makefile create mode 100644 drivers/staging/kpc2000/kpc2000/cell_probe.c create mode 100644 drivers/staging/kpc2000/kpc2000/core.c create mode 100644 drivers/staging/kpc2000/kpc2000/dma_common_defs.h create mode 100644 drivers/staging/kpc2000/kpc2000/fileops.c create mode 100644 drivers/staging/kpc2000/kpc2000/kp2000_module.c create mode 100644 drivers/staging/kpc2000/kpc2000/pcie.h create mode 100644 drivers/staging/kpc2000/kpc2000/uapi.h create mode 100644 drivers/staging/kpc2000/kpc_i2c/Makefile create mode 100644 drivers/staging/kpc2000/kpc_i2c/fileops.c create mode 100644 drivers/staging/kpc2000/kpc_i2c/i2c_driver.c create mode 100644 drivers/staging/kpc2000/kpc_spi/Makefile create mode 100644 drivers/staging/kpc2000/kpc_spi/spi_driver.c create mode 100644 drivers/staging/kpc2000/kpc_spi/spi_parts.h diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index ca944a2db9bc..b770c8c535f4 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -122,4 +122,6 @@ source "drivers/staging/erofs/Kconfig" source "drivers/staging/fieldbus/Kconfig" +source "drivers/staging/kpc2000/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f5b60efb1a0b..0640bd632851 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)+= gasket/ obj-$(CONFIG_XIL_AXIS_FIFO)+= axis-fifo/ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ +obj-$(CONFIG_KPC2000) += kpc2000/ diff --git a/drivers/staging/kpc2000/Kconfig b/drivers/staging/kpc2000/Kconfig new file mode 100644 index ..926e770d6e0e --- /dev/null +++ b/drivers/staging/kpc2000/Kconfig @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + +config KPC2000 + bool "Daktronics KPC Device support" + depends on PCI + help + Select this if you wish to use the Daktronics KPC PCI devices + + If unsure, say N. + +config KPC2000_CORE + tristate "Daktronics KPC PCI UIO device" + depends on KPC2000 + help + Say Y here if you wish to support the Daktronics KPC PCI + device in UIO mode. + + To compile this driver as a module, choose M here: the module + will be called kpc2000 + + If unsure, say N. + +config KPC2000_SPI + tristate "Kaktronics KPC SPI device" + depends on KPC2000 && SPI + help + Say Y here if you wish to support the Daktronics KPC PCI + device in SPI mode. + + To compile this driver as a module, choose M here: the module + will be called kpc2000_spi + + If unsure, say N. + +config KPC2000_I2C + tristate "Kaktron
Re: [GIT PULL] Staging driver fixes for 5.1-rc6
The pull request you sent on Fri, 19 Apr 2019 14:31:04 +0200: > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git > tags/staging-5.1-rc6 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/b222e9af0a250141b302d671d2d1e73e9079c544 Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: rtl8723bs: core: Replace rtw_malloc with kmalloc
On Fri, Apr 19, 2019 at 07:02:47PM +0530, Bhanusree Mahesh wrote: > On Fri, 19 Apr 2019 at 16:52, Greg Kroah-Hartman > wrote: > > > > On Fri, Apr 19, 2019 at 03:52:43PM +0530, Bhanusree Pola wrote: > > > Replace rtw_malloc with kmalloc to make code OS independent > > > use kmalloc second argument as GFP_ATOMIC as these are called by functions > > > that holds lock. > > > > > > Signed-off-by: Bhanusree Pola > > > --- > > > drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c > > > b/drivers/staging/rtl8723bs/core/rtw_ap.c > > > index 18fabf5..6a6683c 100644 > > > --- a/drivers/staging/rtl8723bs/core/rtw_ap.c > > > +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c > > > @@ -128,7 +128,7 @@ static void update_BCNTIM(struct adapter *padapter) > > > } > > > > > > if (remainder_ielen > 0) { > > > - pbackup_remainder_ie = rtw_malloc(remainder_ielen); > > > + pbackup_remainder_ie = > > > kmalloc(remainder_ielen,GFP_ATOMIC); > > > > Always run checkpatch.pl on your patches so you do nto get grumpy > > maintainers telling you to run checkpatch.pl on your code :) > > > > > Why not fix up all of the callers of this function? > > There are many callers of this function. Should I send the whole thing > as of patch series? Yes, that would be good. > >And are you sure > > that GFP_ATOMIC is the correct thing to do here? > > yes, because it is called by the function which holds the lock. What lock? > correct me if I'm wrong. I don't know, but you should document why you did it this way in the changelog comment so that people can review it. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: rtl8723bs: core: Replace return types
Remove unwanted assignments and replace return types. Issue suggested by Coccinelle. Signed-off-by: Madhumitha Prabakaran --- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c index b9d36db762a9..2474fa6fb49b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c @@ -204,8 +204,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) if (list_empty(&pfree_sta_queue->queue)) { /* spin_unlock_bh(&(pfree_sta_queue->lock)); */ spin_unlock_bh(&(pstapriv->sta_hash_lock)); - psta = NULL; - return psta; + return NULL; } else { psta = LIST_CONTAINOR(get_next(&pfree_sta_queue->queue), struct sta_info, list); @@ -586,12 +585,10 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter) struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter) { - struct sta_info *psta; struct sta_priv *pstapriv = &padapter->stapriv; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - psta = rtw_get_stainfo(pstapriv, bc_addr); - return psta; + return rtw_get_stainfo(pstapriv, bc_addr); } u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) -- 2.17.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: mt7621-mmc: Cleanup in msdc_app_cmd()
Remove unwanted variable and replace the respective return type. Issue suggested by Coccinelle. Signed-off-by: Madhumitha Prabakaran --- drivers/staging/mt7621-mmc/sd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c index b12ed2c988fd..2b327fde7145 100644 --- a/drivers/staging/mt7621-mmc/sd.c +++ b/drivers/staging/mt7621-mmc/sd.c @@ -752,7 +752,6 @@ static int msdc_app_cmd(struct mmc_host *mmc, struct msdc_host *host) { struct mmc_command cmd; struct mmc_request mrq; - u32 err; memset(&cmd, 0, sizeof(struct mmc_command)); cmd.opcode = MMC_APP_CMD; @@ -763,8 +762,7 @@ static int msdc_app_cmd(struct mmc_host *mmc, struct msdc_host *host) mrq.cmd = &cmd; cmd.mrq = &mrq; cmd.data = NULL; - err = msdc_do_command(host, &cmd, 0, CMD_TIMEOUT); - return err; + return msdc_do_command(host, &cmd, 0, CMD_TIMEOUT); } static int msdc_tune_cmdrsp(struct msdc_host *host, struct mmc_command *cmd) -- 2.17.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vc04_services: Cleanup in ctrl_set_bitrate()
Remove unnecessary variable and replace return type. Issue suggested by Coccinelle. Signed-off-by: Madhumitha Prabakaran --- drivers/staging/vc04_services/bcm2835-camera/controls.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c index e39ab5fae724..f87fa7f61db3 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c @@ -607,18 +607,13 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, struct v4l2_ctrl *ctrl, const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl) { - int ret; struct vchiq_mmal_port *encoder_out; dev->capture.encode_bitrate = ctrl->val; encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0]; - ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out, - mmal_ctrl->mmal_id, - &ctrl->val, sizeof(ctrl->val)); - ret = 0; - return ret; + return 0; } static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev, -- 2.17.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: rtlwifi: Replace return type
Replace return type and remove the respective assignment. Issue found by Coccinelle. Signed-off-by: Madhumitha Prabakaran --- drivers/staging/rtlwifi/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtlwifi/core.c b/drivers/staging/rtlwifi/core.c index 2cce65368f92..1e4e858f7517 100644 --- a/drivers/staging/rtlwifi/core.c +++ b/drivers/staging/rtlwifi/core.c @@ -377,9 +377,7 @@ static u16 _calculate_wol_pattern_crc(u8 *pattern, u16 len) for (i = 0; i < len; i++) crc = crc16_ccitt(pattern[i], crc); - crc = ~crc; - - return crc; + return ~crc; } static void _rtl_add_wowlan_patterns(struct ieee80211_hw *hw, -- 2.17.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: vc04_services: Cleanup in ctrl_set_bitrate()
Hi Madhumitha, Am 19.04.19 um 23:23 schrieb Madhumitha Prabakaran: > Remove unnecessary variable and replace return type. > > Issue suggested by Coccinelle. > > Signed-off-by: Madhumitha Prabakaran > --- > drivers/staging/vc04_services/bcm2835-camera/controls.c | 7 +-- > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c > b/drivers/staging/vc04_services/bcm2835-camera/controls.c > index e39ab5fae724..f87fa7f61db3 100644 > --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c > +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c > @@ -607,18 +607,13 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, > struct v4l2_ctrl *ctrl, > const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl) > { > - int ret; > struct vchiq_mmal_port *encoder_out; > > dev->capture.encode_bitrate = ctrl->val; > > encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0]; > > - ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out, > - mmal_ctrl->mmal_id, > - &ctrl->val, sizeof(ctrl->val)); > - ret = 0; > - return ret; > + return 0; i don't understand why we can remove here the function call. Stefan > } > > static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev, ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3 09/26] compat_ioctl: move drivers to compat_ptr_ioctl
On Tue, Apr 16, 2019 at 10:19:47PM +0200, Arnd Bergmann wrote: > Each of these drivers has a copy of the same trivial helper function to > convert the pointer argument and then call the native ioctl handler. > > We now have a generic implementation of that, so use it. > > Acked-by: Greg Kroah-Hartman > Reviewed-by: Jarkko Sakkinen > Reviewed-by: Jason Gunthorpe > Signed-off-by: Arnd Bergmann Acked-by: Michael S. Tsirkin > --- > drivers/char/ppdev.c | 12 +- > drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- > drivers/firewire/core-cdev.c | 12 +- > drivers/hid/usbhid/hiddev.c | 11 + > drivers/hwtracing/stm/core.c | 12 +- > drivers/misc/mei/main.c | 22 + > drivers/mtd/ubi/cdev.c| 36 +++- > drivers/net/tap.c | 12 +- > drivers/staging/pi433/pi433_if.c | 12 +- > drivers/usb/core/devio.c | 16 + > drivers/vfio/vfio.c | 39 +++ > drivers/vhost/net.c | 12 +- > drivers/vhost/scsi.c | 12 +- > drivers/vhost/test.c | 12 +- > drivers/vhost/vsock.c | 12 +- > fs/fat/file.c | 13 +-- > 16 files changed, 20 insertions(+), 237 deletions(-) > > diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c > index 1ae77b41050a..e96c8d9623e0 100644 > --- a/drivers/char/ppdev.c > +++ b/drivers/char/ppdev.c > @@ -674,14 +674,6 @@ static long pp_ioctl(struct file *file, unsigned int > cmd, unsigned long arg) > return ret; > } > > -#ifdef CONFIG_COMPAT > -static long pp_compat_ioctl(struct file *file, unsigned int cmd, > - unsigned long arg) > -{ > - return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); > -} > -#endif > - > static int pp_open(struct inode *inode, struct file *file) > { > unsigned int minor = iminor(inode); > @@ -790,9 +782,7 @@ static const struct file_operations pp_fops = { > .write = pp_write, > .poll = pp_poll, > .unlocked_ioctl = pp_ioctl, > -#ifdef CONFIG_COMPAT > - .compat_ioctl = pp_compat_ioctl, > -#endif > + .compat_ioctl = compat_ptr_ioctl, > .open = pp_open, > .release= pp_release, > }; > diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c > b/drivers/char/tpm/tpm_vtpm_proxy.c > index d74f3de74ae6..fb845f0a430b 100644 > --- a/drivers/char/tpm/tpm_vtpm_proxy.c > +++ b/drivers/char/tpm/tpm_vtpm_proxy.c > @@ -675,20 +675,10 @@ static long vtpmx_fops_ioctl(struct file *f, unsigned > int ioctl, > } > } > > -#ifdef CONFIG_COMPAT > -static long vtpmx_fops_compat_ioctl(struct file *f, unsigned int ioctl, > - unsigned long arg) > -{ > - return vtpmx_fops_ioctl(f, ioctl, (unsigned long)compat_ptr(arg)); > -} > -#endif > - > static const struct file_operations vtpmx_fops = { > .owner = THIS_MODULE, > .unlocked_ioctl = vtpmx_fops_ioctl, > -#ifdef CONFIG_COMPAT > - .compat_ioctl = vtpmx_fops_compat_ioctl, > -#endif > + .compat_ioctl = compat_ptr_ioctl, > .llseek = noop_llseek, > }; > > diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c > index 16a7045736a9..fb934680fdd3 100644 > --- a/drivers/firewire/core-cdev.c > +++ b/drivers/firewire/core-cdev.c > @@ -1659,14 +1659,6 @@ static long fw_device_op_ioctl(struct file *file, > return dispatch_ioctl(file->private_data, cmd, (void __user *)arg); > } > > -#ifdef CONFIG_COMPAT > -static long fw_device_op_compat_ioctl(struct file *file, > - unsigned int cmd, unsigned long arg) > -{ > - return dispatch_ioctl(file->private_data, cmd, compat_ptr(arg)); > -} > -#endif > - > static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma) > { > struct client *client = file->private_data; > @@ -1808,7 +1800,5 @@ const struct file_operations fw_device_ops = { > .mmap = fw_device_op_mmap, > .release= fw_device_op_release, > .poll = fw_device_op_poll, > -#ifdef CONFIG_COMPAT > - .compat_ioctl = fw_device_op_compat_ioctl, > -#endif > + .compat_ioctl = compat_ptr_ioctl, > }; > diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c > index a746017fac17..ef4a1cd389d6 100644 > --- a/drivers/hid/usbhid/hiddev.c > +++ b/drivers/hid/usbhid/hiddev.c > @@ -855,13 +855,6 @@ static long hiddev_ioctl(struct file *file, unsigned int > cmd, unsigned long arg) > return r; > } > > -#ifdef CONFIG_COMPAT > -static long hiddev_compat_ioctl(struct file *file, unsigned int cmd, > unsigned long arg) > -{ > - return hiddev_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); > -} > -#endif > - > static const struct file_operations hiddev_fops = { > .owner =THIS_MODULE,
Re: [PATCH] Staging: vc04_services: Cleanup in ctrl_set_bitrate()
On 04/19 :49, Stefan Wahren wrote: > Hi Madhumitha, > > Am 19.04.19 um 23:23 schrieb Madhumitha Prabakaran: > > Remove unnecessary variable and replace return type. > > > > Issue suggested by Coccinelle. > > > > Signed-off-by: Madhumitha Prabakaran > > --- > > drivers/staging/vc04_services/bcm2835-camera/controls.c | 7 +-- > > 1 file changed, 1 insertion(+), 6 deletions(-) > > > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c > > b/drivers/staging/vc04_services/bcm2835-camera/controls.c > > index e39ab5fae724..f87fa7f61db3 100644 > > --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c > > +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c > > @@ -607,18 +607,13 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev > > *dev, > > struct v4l2_ctrl *ctrl, > > const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl) > > { > > - int ret; > > struct vchiq_mmal_port *encoder_out; > > > > dev->capture.encode_bitrate = ctrl->val; > > > > encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0]; > > > > - ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out, > > - mmal_ctrl->mmal_id, > > - &ctrl->val, sizeof(ctrl->val)); > > - ret = 0; > > - return ret; > > + return 0; > > i don't understand why we can remove here the function call. I overlooked the function call. I will fix it. > > Stefan > > > } > > > > static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev, ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: fsl-dpaa2: use help instead of ---help--- in Kconfig
From: Moses Christopher - Resolve the following warning from the Kconfig, "WARNING: prefer 'help' over '---help---' for new help texts" Signed-off-by: Moses Christopher --- drivers/staging/fsl-dpaa2/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/Kconfig b/drivers/staging/fsl-dpaa2/Kconfig index 991e154c0eca..b7852f49b4fb 100644 --- a/drivers/staging/fsl-dpaa2/Kconfig +++ b/drivers/staging/fsl-dpaa2/Kconfig @@ -5,7 +5,7 @@ config FSL_DPAA2 bool "Freescale DPAA2 devices" depends on FSL_MC_BUS - ---help--- + help Build drivers for Freescale DataPath Acceleration Architecture (DPAA2) family of SoCs. @@ -13,6 +13,6 @@ config FSL_DPAA2_ETHSW tristate "Freescale DPAA2 Ethernet Switch" depends on FSL_DPAA2 depends on NET_SWITCHDEV - ---help--- + help Driver for Freescale DPAA2 Ethernet Switch. Select BRIDGE to have support for bridge tools. -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel