From patchwork Fri Dec 21 01:17:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 10739785 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 AA99914E5 for ; Fri, 21 Dec 2018 01:19:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B40828958 for ; Fri, 21 Dec 2018 01:19:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F34428961; Fri, 21 Dec 2018 01:19:44 +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 4003328958 for ; Fri, 21 Dec 2018 01:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388138AbeLUBTn (ORCPT ); Thu, 20 Dec 2018 20:19:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:37378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388680AbeLUBSZ (ORCPT ); Thu, 20 Dec 2018 20:18:25 -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 2602521904; Fri, 21 Dec 2018 01:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545355104; bh=+Bt4mMi8YqMYFjKJbypQUlvKkRIjSTGbKPlFNh58u9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pt33fX5REvws5Bc9lx5yt6hqdH4nzdKepGUjObe12bqylEqjNhZAf/qvrGPYUF0nJ Wwy1WtcxecM6iV8/gQScWTuIQ0Y1IhI2wjVVlVRAkMg1b7oEqthamoypXmjSU/h/Jq jmIzhTt5cXPMMxql5TN19woePwUGklT0Sr67whYw= 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 07/14] media: wl128x-radio: convert to platform device Date: Fri, 21 Dec 2018 02:17:45 +0100 Message-Id: <20181221011752.25627-8-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 This converts the wl128x FM radio module into a platform device. It's a preparation for using it from hci_ll Bluetooth driver instead of TI_ST. Signed-off-by: Sebastian Reichel Acked-by: Pavel Machek --- drivers/media/radio/wl128x/fmdrv_common.c | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index f77acec0addf..9526613adf91 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c @@ -35,11 +35,10 @@ #include "fmdrv_v4l2.h" #include "fmdrv_common.h" #include +#include #include "fmdrv_rx.h" #include "fmdrv_tx.h" -struct fmdev *global_fmdev; - /* Region info */ static struct region_info region_configs[] = { /* Europe/US */ @@ -1615,23 +1614,19 @@ int fmc_release(struct fmdev *fmdev) return ret; } -/* - * Module init function. Ask FM V4L module to register video device. - * Allocate memory for FM driver context and RX RDS buffer. - */ -static int __init fm_drv_init(void) +static int wl128x_fm_probe(struct platform_device *dev) { struct fmdev *fmdev = NULL; int ret = -ENOMEM; fmdbg("FM driver\n"); + /* Allocate memory for FM driver context and RX RDS buffer. */ fmdev = kzalloc(sizeof(struct fmdev), GFP_KERNEL); if (NULL == fmdev) { fmerr("Can't allocate operation structure memory\n"); return ret; } - global_fmdev = fmdev; fmdev->rx.rds.buf_size = default_rds_buf * FM_RDS_BLK_SIZE; fmdev->rx.rds.buff = kzalloc(fmdev->rx.rds.buf_size, GFP_KERNEL); if (NULL == fmdev->rx.rds.buff) { @@ -1639,6 +1634,7 @@ static int __init fm_drv_init(void) goto rel_dev; } + /* Ask FM V4L module to register video device. */ ret = fm_v4l2_init_video_device(fmdev, radio_nr); if (ret < 0) goto rel_rdsbuf; @@ -1657,10 +1653,9 @@ static int __init fm_drv_init(void) return ret; } -/* Module exit function. Ask FM V4L module to unregister video device */ -static void __exit fm_drv_exit(void) +static int wl128x_fm_remove(struct platform_device *dev) { - struct fmdev *fmdev = global_fmdev; + struct fmdev *fmdev = platform_get_drvdata(pdev); /* Ask FM V4L module to unregister video device */ fm_v4l2_deinit_video_device(fmdev); @@ -1668,12 +1663,19 @@ static void __exit fm_drv_exit(void) kfree(fmdev->rx.rds.buff); kfree(fmdev); } + + return 0; } -module_init(fm_drv_init); -module_exit(fm_drv_exit); +static struct platform_driver wl128x_fm_drv = { + .driver = { + .name = "wl128x-fm", + }, + .probe = wl128x_fm_probe, + .remove = wl128x_fm_remove, +}; +module_platform_driver(wl128x_fm_drv); -/* ------------- Module Info ------------- */ MODULE_AUTHOR("Manjunatha Halli "); MODULE_DESCRIPTION("FM Driver for TI's Connectivity chip"); MODULE_LICENSE("GPL");