From: Sebastian Reichel <sre@kernel.org>
To: Sebastian Reichel <sre@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Marcel Holtmann <marcel@holtmann.org>,
Tony Lindgren <tony@atomide.com>
Cc: Rob Herring <robh@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Pavel Machek <pavel@ucw.cz>,
linux-bluetooth@vger.kernel.org, linux-media@vger.kernel.org,
linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: [PATCH 05/14] media: wl128x-radio: remove global radio_disconnected
Date: Fri, 21 Dec 2018 02:17:43 +0100 [thread overview]
Message-ID: <20181221011752.25627-6-sre@kernel.org> (raw)
In-Reply-To: <20181221011752.25627-1-sre@kernel.org>
From: Sebastian Reichel <sebastian.reichel@collabora.com>
Move global radio_disconnected into device structure to
prepare converting this driver into a normal platform
device driver supporting multiple instances.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/media/radio/wl128x/fmdrv.h | 1 +
drivers/media/radio/wl128x/fmdrv_v4l2.c | 15 +++++++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/media/radio/wl128x/fmdrv.h b/drivers/media/radio/wl128x/fmdrv.h
index 8ed7c0aeb8b9..fa89eef59295 100644
--- a/drivers/media/radio/wl128x/fmdrv.h
+++ b/drivers/media/radio/wl128x/fmdrv.h
@@ -201,6 +201,7 @@ struct fmdev {
struct v4l2_device v4l2_dev; /* V4L2 top level struct */
struct snd_card *card; /* Card which holds FM mixer controls */
u16 asci_id;
+ u8 radio_disconnected;
spinlock_t rds_buff_lock; /* To protect access to RDS buffer */
spinlock_t resp_skb_lock; /* To protect access to received SKB */
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index e25fd4d4d280..f541b5802844 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -33,7 +33,6 @@
#include "fmdrv_tx.h"
static struct video_device gradio_dev;
-static u8 radio_disconnected;
/* -- V4L2 RADIO (/dev/radioX) device file operation interfaces --- */
@@ -47,7 +46,7 @@ static ssize_t fm_v4l2_fops_read(struct file *file, char __user * buf,
fmdev = video_drvdata(file);
- if (!radio_disconnected) {
+ if (!fmdev->radio_disconnected) {
fmerr("FM device is already disconnected\n");
return -EIO;
}
@@ -126,14 +125,14 @@ static int fm_v4l2_fops_open(struct file *file)
int ret;
struct fmdev *fmdev = NULL;
+ fmdev = video_drvdata(file);
+
/* Don't allow multiple open */
- if (radio_disconnected) {
+ if (fmdev->radio_disconnected) {
fmerr("FM device is already opened\n");
return -EBUSY;
}
- fmdev = video_drvdata(file);
-
if (mutex_lock_interruptible(&fmdev->mutex))
return -ERESTARTSYS;
ret = fmc_prepare(fmdev);
@@ -149,7 +148,7 @@ static int fm_v4l2_fops_open(struct file *file)
fmerr("Unable to load FM RX firmware\n");
goto open_unlock;
}
- radio_disconnected = 1;
+ fmdev->radio_disconnected = 1;
open_unlock:
mutex_unlock(&fmdev->mutex);
@@ -162,7 +161,7 @@ static int fm_v4l2_fops_release(struct file *file)
struct fmdev *fmdev;
fmdev = video_drvdata(file);
- if (!radio_disconnected) {
+ if (!fmdev->radio_disconnected) {
fmdbg("FM device is already closed\n");
return 0;
}
@@ -179,7 +178,7 @@ static int fm_v4l2_fops_release(struct file *file)
fmerr("FM CORE release failed\n");
goto release_unlock;
}
- radio_disconnected = 0;
+ fmdev->radio_disconnected = 0;
release_unlock:
mutex_unlock(&fmdev->mutex);
--
2.19.2
next prev parent reply other threads:[~2018-12-21 1:19 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-21 1:17 [PATCH 00/14] Add support for FM radio in hcill and kill TI_ST Sebastian Reichel
2018-12-21 1:17 ` [PATCH 01/14] ARM: dts: LogicPD Torpedo: Add WiLink UART node Sebastian Reichel
2018-12-21 20:05 ` Adam Ford
2018-12-21 1:17 ` [PATCH 02/14] ARM: dts: IGEP: " Sebastian Reichel
2019-02-18 22:04 ` Enric Balletbo Serra
2018-12-21 1:17 ` [PATCH 03/14] ARM: OMAP2+: pdata-quirks: drop TI_ST/KIM support Sebastian Reichel
2018-12-21 1:17 ` [PATCH 04/14] media: wl128x-radio: remove module version Sebastian Reichel
2018-12-21 1:17 ` Sebastian Reichel [this message]
2018-12-22 19:10 ` [PATCH 05/14] media: wl128x-radio: remove global radio_disconnected Pavel Machek
2018-12-21 1:17 ` [PATCH 06/14] media: wl128x-radio: remove global radio_dev Sebastian Reichel
2018-12-22 19:16 ` Pavel Machek
2018-12-21 1:17 ` [PATCH 07/14] media: wl128x-radio: convert to platform device Sebastian Reichel
2018-12-22 19:17 ` Pavel Machek
2018-12-21 1:17 ` [PATCH 08/14] media: wl128x-radio: use device managed memory allocation Sebastian Reichel
2018-12-22 19:20 ` Pavel Machek
2018-12-21 1:17 ` [PATCH 09/14] media: wl128x-radio: load firmware from ti-connectivity/ Sebastian Reichel
2018-12-21 1:17 ` [PATCH 10/14] media: wl128x-radio: simplify fmc_prepare/fmc_release Sebastian Reichel
2018-12-22 19:29 ` Pavel Machek
2019-01-09 18:17 ` Sebastian Reichel
2018-12-21 1:17 ` [PATCH 11/14] media: wl128x-radio: fix skb debug printing Sebastian Reichel
2018-12-22 19:30 ` Pavel Machek
2018-12-21 1:17 ` [PATCH 12/14] media: wl128x-radio: move from TI_ST to hci_ll driver Sebastian Reichel
2018-12-23 15:56 ` Marcel Holtmann
2019-01-09 18:11 ` Sebastian Reichel
2019-01-09 19:24 ` Marcel Holtmann
2019-01-10 1:23 ` Rob Herring
2018-12-21 1:17 ` [PATCH 13/14] Bluetooth: btwilink: drop superseded driver Sebastian Reichel
2018-12-21 1:17 ` [PATCH 14/14] misc: ti-st: Drop " Sebastian Reichel
2018-12-21 21:10 ` Adam Ford
2018-12-22 3:00 ` Sebastian Reichel
2018-12-22 13:17 ` Adam Ford
2018-12-21 18:02 ` [PATCH 00/14] Add support for FM radio in hcill and kill TI_ST Tony Lindgren
2018-12-22 2:47 ` Sebastian Reichel
2018-12-23 16:15 ` Tony Lindgren
2018-12-22 20:36 ` Adam Ford
2018-12-23 16:22 ` Tony Lindgren
2018-12-22 20:08 ` Pavel Machek
2018-12-22 22:40 ` Pavel Machek
2019-01-10 17:42 ` Sebastian Reichel
2019-03-14 8:20 ` Hans Verkuil
2019-03-14 12:18 ` Adam Ford
2019-03-19 13:31 ` Sebastian Reichel
2019-05-07 17:26 ` Adam Ford
2019-05-07 18:34 ` Adam Ford
2019-05-08 20:58 ` Marcel Holtmann
2019-05-10 13:28 ` Adam Ford
2019-05-10 15:38 ` Marcel Holtmann
2019-09-30 23:42 ` Adam Ford
2019-10-02 19:03 ` Adam Ford
2019-10-03 13:42 ` Sebastian Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181221011752.25627-6-sre@kernel.org \
--to=sre@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=mchehab@kernel.org \
--cc=pavel@ucw.cz \
--cc=robh@kernel.org \
--cc=sebastian.reichel@collabora.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).