From patchwork Sat Aug 31 10:26:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 824635 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDEC416A940 for ; Sat, 31 Aug 2024 10:26:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725100012; cv=none; b=kh1gxMXB/84zDHJLClNeVi/ro0DX5S4mp0u+QC83uUGb7flSrVDzBunJkvqogdJWuMfRz3Ng0+Si9T87V8LqE3GaQmwWzK7YJb83m5DFzHKNJ9M9I2Vz+hMjap5JL8amiMaOYVlQ+kPa19bZ3OgfwQLoP8IZvse16irFjYCixrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725100012; c=relaxed/simple; bh=VfL0rVvkqV7KN/5mT6XRH9xVHWl+tfxDMjV+Cf5ivas=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CiBq3Pzt7zqkBr8t8iTAx81mfMOmbMlnYmPOmYEkRz41YDAi846wukgA8eRl5hE0EUoPATur8MySjYKm4WzEH8oAxi5AY4KzNh0+lMZjPvkgkhCsA55644hV0VAs8Ec9CzobPaVDvOJ7ivg4MYXXHs77Nht4Uws1NCZCNoSebRY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Wwrlr5Tl7z4f3jcr for ; Sat, 31 Aug 2024 18:26:32 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 8757C1A018D for ; Sat, 31 Aug 2024 18:26:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.48.32.205]) by APP4 (Coremail) with SMTP id gCh0CgAHL4Xk79JmcrjoDA--.26679S4; Sat, 31 Aug 2024 18:26:47 +0800 (CST) From: Yang Yingliang To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, Jonathan.Cameron@huawei.com, broonie@kernel.org, yangyingliang@huawei.com, liwei391@huawei.com Subject: [PATCH -next 1/2] media: usb/msi2500: switch to use spi_alloc_host() Date: Sat, 31 Aug 2024 18:26:42 +0800 Message-ID: <20240831102643.1229-1-yangyingliang@huaweicloud.com> X-Mailer: git-send-email 2.46.0.windows.1 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHL4Xk79JmcrjoDA--.26679S4 X-Coremail-Antispam: 1UD129KBjvdXoWrtw17Gw17ZFyUJr4UXr1kXwb_yoWfJrXE93 Z3uw4xW34qkr1F9r1UK34Iv340krWxWF4kWa4Yyw13AF15W3WDJwnFkr18Zr1j9r4akFnx tw1kXr429rnrCjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbzkYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwV A0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x02 67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxV AFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2 j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7x kEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0E wIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E74 80Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0 I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04 k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7Cj xVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07UK2NtUUUUU= X-CM-SenderInfo: 51dqw5xlqjzxhdqjqx5xdzvxpfor3voofrz/ From: Yang Yingliang Switch to use modern name function spi_alloc_host(). No functional changed. Signed-off-by: Yang Yingliang --- drivers/media/usb/msi2500/msi2500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c index 5138486abfa0..05b0550e840c 100644 --- a/drivers/media/usb/msi2500/msi2500.c +++ b/drivers/media/usb/msi2500/msi2500.c @@ -1219,8 +1219,8 @@ static int msi2500_probe(struct usb_interface *intf, goto err_free_mem; } - /* SPI master adapter */ - ctlr = spi_alloc_master(dev->dev, 0); + /* SPI host adapter */ + ctlr = spi_alloc_host(dev->dev, 0); if (ctlr == NULL) { ret = -ENOMEM; goto err_unregister_v4l2_dev; From patchwork Sat Aug 31 10:26:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 824508 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42FA9170A10 for ; Sat, 31 Aug 2024 10:26:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725100012; cv=none; b=XAdOZkxT0DnzmVl2c3F1pploTXRrnpCHjxIDzFYq/ypZf5gHBAAY+d82LO0mCDZzO0LluZEuGA14X3cvpecX5mntdvQwB3YDegLMCnpajBRqxLjddzrWhvqeAVO4MdPx5IBDlMTcOpD0BXkE4EKY3nJiFW6eND7ORi6GfnNt1tE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725100012; c=relaxed/simple; bh=vBTTg1R8re9W3zthz6KQsf5NFvtaShxQgMaDNxviz/Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J7y3V5bL0MfdTCrJRKqrQl5291YLVH1DiThVUBQfQVTopMQUCU/wTH1Yx3laXqA4tAi+rt8SP8hTqAxMmOltO7aIQ30Yqt2otBcdP/vAxY4LoZiApjxUAcLyiEBd9VHRSVCvVEr6kK9dMk6cg8u+q6hcH1oORO7/arXIbV6tBe4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Wwrlr4d3nz4f3lCf for ; Sat, 31 Aug 2024 18:26:32 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 4958C1A0E9B for ; Sat, 31 Aug 2024 18:26:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.48.32.205]) by APP4 (Coremail) with SMTP id gCh0CgAHL4Xk79JmcrjoDA--.26679S5; Sat, 31 Aug 2024 18:26:48 +0800 (CST) From: Yang Yingliang To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, Jonathan.Cameron@huawei.com, broonie@kernel.org, yangyingliang@huawei.com, liwei391@huawei.com Subject: [PATCH -next 2/2] media: netup_unidvb: switch to use devm_spi_alloc_host() Date: Sat, 31 Aug 2024 18:26:43 +0800 Message-ID: <20240831102643.1229-2-yangyingliang@huaweicloud.com> X-Mailer: git-send-email 2.46.0.windows.1 In-Reply-To: <20240831102643.1229-1-yangyingliang@huaweicloud.com> References: <20240831102643.1229-1-yangyingliang@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHL4Xk79JmcrjoDA--.26679S5 X-Coremail-Antispam: 1UD129KBjvdXoW7XFy7GFWxtFWDZF4fJr1DZFb_yoWkZFc_uF yavw17ZayjgF17trnrKr18Za9Y9FWYqr40gr1S9w13Gryrur48KFn7tF13Jrs29w17Cw1x Xr90vFWvyr12gjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbTxYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r18M2 8IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK 021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F 4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0 oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7V C0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j 6r4UM4x0Y48IcxkI7VAKI48JMxkF7I0En4kS14v26r126r1DMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v2 0xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV W8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU88nY5UUUUU== X-CM-SenderInfo: 51dqw5xlqjzxhdqjqx5xdzvxpfor3voofrz/ From: Yang Yingliang Switch to use modern name function devm_spi_alloc_host(). No functional changed. Signed-off-by: Yang Yingliang --- drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c index e90aa1c1584c..34d6d52f1e4e 100644 --- a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c +++ b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c @@ -175,11 +175,11 @@ int netup_spi_init(struct netup_unidvb_dev *ndev) struct spi_controller *ctlr; struct netup_spi *nspi; - ctlr = devm_spi_alloc_master(&ndev->pci_dev->dev, - sizeof(struct netup_spi)); + ctlr = devm_spi_alloc_host(&ndev->pci_dev->dev, + sizeof(struct netup_spi)); if (!ctlr) { dev_err(&ndev->pci_dev->dev, - "%s(): unable to alloc SPI master\n", __func__); + "%s(): unable to alloc SPI host\n", __func__); return -EINVAL; } nspi = spi_controller_get_devdata(ctlr);