From patchwork Sun Oct 15 20:51:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 10007275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C28960216 for ; Sun, 15 Oct 2017 20:52:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DB2E252D5 for ; Sun, 15 Oct 2017 20:52:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62CA6256E6; Sun, 15 Oct 2017 20:52:21 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 08B95252D5 for ; Sun, 15 Oct 2017 20:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751593AbdJOUwR (ORCPT ); Sun, 15 Oct 2017 16:52:17 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:38868 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441AbdJOUwG (ORCPT ); Sun, 15 Oct 2017 16:52:06 -0400 Received: by mail-wm0-f65.google.com with SMTP id q124so6147900wmb.5 for ; Sun, 15 Oct 2017 13:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=na1AOF1LjZo72O/V4+PhWzDY/CSfQZ9a1pzhq6KD+xg=; b=UpsWW13pZYDxzBcORUg9LVOzvK5jAu6nPa5JEtMGzPJrK+szPEIfEm8velh9+vqPLM WGo5hF6U6EJ1fMUUheMZIC+lKj02TkbLAPE8EeI/eYgBu62SEHSDK5CJFh/T0/Vsk8zT AVlzhvPRougAMnRNRaBeIX7y8dl4uftTRzEqDcZEvis6D5hKtcjFaiZLpXsqm4dlOf4t WDeFoiyO169fW/XMyDdi9LYKXv7trbHyWFW/lr/t1Zu+eLGRD2oG8KSpOK3Y2MxbUDW2 IiUhfSNGxeJ1ChmzWiraNf+X1BiRkdVE/ZSoTBBcQ8DhO16XnB1gtc/RRt/0Mxzi2pRQ P7Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=na1AOF1LjZo72O/V4+PhWzDY/CSfQZ9a1pzhq6KD+xg=; b=Sg3Hrs6tEUMsKCXhnLhWhjF6XDVbDAdVaCkVaTGxBI/jBiwPwXWb94gnfkISxu4d9r 7l8vjASK6G4DdDIDrG4m/lWgcaL72/unuBV1sNpyM9oj2TYcG4cBxUuAIvc4ytmIixf7 Ua+bbF7AMNcY60RS7FwG3QHEIe0uciRmRmrOGT0fwRE2f4yVdQKQpnz6I8+/JzsZjpPy 0U46JXusDN3v370ikyracVWY0a6NdTcYCBFqZUmc39H1HuY3luwBaLS8+CxKkuEEqtUY JR8XkhZAWkuCyCN0IoeNhoyjaypIeZgLFYhvNqcsET/wrY6bFojGF45zTG9uTUJ3y0EF 74MA== X-Gm-Message-State: AMCzsaUz7rKZSfZS8pKRAxpro2nLdRjYO6BbuXwUhic6A6e6SZXXfVgD dfArKjYs7uSUmxHeh3m33Bh0WQ== X-Google-Smtp-Source: AOwi7QAMdmohVYyCkSSxGq1hPnCVOTOxzFEk5IFZ5K/bq8/NW+KRWTSLhQOqhbx3UBO6VLRdMNP7jQ== X-Received: by 10.223.197.131 with SMTP id m3mr7125158wrg.0.1508100724790; Sun, 15 Oct 2017 13:52:04 -0700 (PDT) Received: from dvbdev.wuest.de (ip-37-201-239-211.hsi13.unitymediagroup.de. [37.201.239.211]) by smtp.gmail.com with ESMTPSA id d18sm4609498wra.50.2017.10.15.13.52.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Oct 2017 13:52:04 -0700 (PDT) From: Daniel Scheller To: linux-media@vger.kernel.org, mchehab@kernel.org, mchehab@s-opensource.com Cc: jasmin@anw.at, rjkm@metzlerbros.de Subject: [PATCH 6/8] [media] ddbridge/max: prefix lnb_init_fmode() and fe_attach_mxl5xx() Date: Sun, 15 Oct 2017 22:51:55 +0200 Message-Id: <20171015205157.14342-7-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171015205157.14342-1-d.scheller.oss@gmail.com> References: <20171015205157.14342-1-d.scheller.oss@gmail.com> 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: Daniel Scheller Add a ddb_ prefix to the two functions to better avoid conflicts in the global namespace, ie. when building everything into the kernel image. Signed-off-by: Daniel Scheller --- drivers/media/pci/ddbridge/ddbridge-core.c | 4 ++-- drivers/media/pci/ddbridge/ddbridge-max.c | 6 +++--- drivers/media/pci/ddbridge/ddbridge-max.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index e2e793b749f2..348cc8b3d1f9 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -1442,7 +1442,7 @@ static int dvb_input_attach(struct ddb_input *input) dvb->fe2 = NULL; switch (port->type) { case DDB_TUNER_MXL5XX: - if (fe_attach_mxl5xx(input) < 0) + if (ddb_fe_attach_mxl5xx(input) < 0) return -ENODEV; break; case DDB_TUNER_DVBS_ST: @@ -2955,7 +2955,7 @@ static ssize_t fmode_store(struct device *device, struct device_attribute *attr, return -EINVAL; if (val > 3) return -EINVAL; - lnb_init_fmode(dev, &dev->link[num], val); + ddb_lnb_init_fmode(dev, &dev->link[num], val); return count; } diff --git a/drivers/media/pci/ddbridge/ddbridge-max.c b/drivers/media/pci/ddbridge/ddbridge-max.c index 67ab4e300a36..dc6b81488746 100644 --- a/drivers/media/pci/ddbridge/ddbridge-max.c +++ b/drivers/media/pci/ddbridge/ddbridge-max.c @@ -360,7 +360,7 @@ static int mxl_fw_read(void *priv, u8 *buf, u32 len) return ddbridge_flashread(dev, link->nr, buf, 0xc0000, len); } -int lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm) +int ddb_lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm) { u32 l = link->nr; @@ -404,7 +404,7 @@ static struct mxl5xx_cfg mxl5xx = { .fw_read = mxl_fw_read, }; -int fe_attach_mxl5xx(struct ddb_input *input) +int ddb_fe_attach_mxl5xx(struct ddb_input *input) { struct ddb *dev = input->port->dev; struct i2c_adapter *i2c = &input->port->i2c->adap; @@ -440,7 +440,7 @@ int fe_attach_mxl5xx(struct ddb_input *input) lnb_command(dev, port->lnr, input->nr, LNB_CMD_INIT); lnb_set_voltage(dev, port->lnr, input->nr, SEC_VOLTAGE_OFF); } - lnb_init_fmode(dev, link, fmode); + ddb_lnb_init_fmode(dev, link, fmode); dvb->fe->ops.set_voltage = max_set_voltage; dvb->fe->ops.enable_high_lnb_voltage = max_enable_high_lnb_voltage; diff --git a/drivers/media/pci/ddbridge/ddbridge-max.h b/drivers/media/pci/ddbridge/ddbridge-max.h index b1bfbbea4337..bf8bf38739f6 100644 --- a/drivers/media/pci/ddbridge/ddbridge-max.h +++ b/drivers/media/pci/ddbridge/ddbridge-max.h @@ -23,7 +23,7 @@ /******************************************************************************/ -int lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm); -int fe_attach_mxl5xx(struct ddb_input *input); +int ddb_lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm); +int ddb_fe_attach_mxl5xx(struct ddb_input *input); #endif /* _DDBRIDGE_MAX_H */