From patchwork Fri Dec 21 01:17:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 10739789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C94811850 for ; Fri, 21 Dec 2018 01:19:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B950A2895F for ; Fri, 21 Dec 2018 01:19:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD22B28968; Fri, 21 Dec 2018 01:19:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50F452895F for ; Fri, 21 Dec 2018 01:19:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388673AbeLUBSW (ORCPT ); Thu, 20 Dec 2018 20:18:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:37276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388648AbeLUBSU (ORCPT ); Thu, 20 Dec 2018 20:18:20 -0500 Received: from mail.kernel.org (unknown [185.216.33.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E5D4021907; Fri, 21 Dec 2018 01:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545355099; bh=tytiSmQOqHm4N1cq03I32DUKolSOX1kji1iS3bg0fGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GulHGxSNtHauBAnDTqzV4KuOSpSbDvfvqrLTaVbpajc+bYvuH0r43XHoqeCTk3UoV qbL+n7F2B9fSkeEsMioY7+jY35xYGwrkOSNaK1UgfACk+gkYrGfNKuTUctP/ij/qvO mnGUwvCm/GlxPdsxlE1904frit1Z9dRnbnCLdWKQ= From: Sebastian Reichel To: Sebastian Reichel , Mauro Carvalho Chehab , Marcel Holtmann , Tony Lindgren Cc: Rob Herring , Greg Kroah-Hartman , Pavel Machek , linux-bluetooth@vger.kernel.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel Subject: [PATCH 05/14] media: wl128x-radio: remove global radio_disconnected Date: Fri, 21 Dec 2018 02:17:43 +0100 Message-Id: <20181221011752.25627-6-sre@kernel.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181221011752.25627-1-sre@kernel.org> References: <20181221011752.25627-1-sre@kernel.org> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sebastian Reichel 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 Acked-by: Pavel Machek --- 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);