From patchwork Mon Jan 17 15:19:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1580866 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jcwbx4YK6z9ssD for ; Tue, 18 Jan 2022 02:21:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n9Tp0-0007iO-IW; Mon, 17 Jan 2022 15:21:26 +0000 Received: from mail-pl1-f181.google.com ([209.85.214.181]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n9Tnn-00071y-SS for kernel-team@lists.ubuntu.com; Mon, 17 Jan 2022 15:20:12 +0000 Received: by mail-pl1-f181.google.com with SMTP id u11so16399951plh.13 for ; Mon, 17 Jan 2022 07:20:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NMkZJ/Al9EMZ2By2pMCHFxEifaFYMt+ofSymSvroSfg=; b=xTfB+Mn5QKQEURnq3CU5JZ5oyT+BLf6xlv9Clzz0Xjy4dPVDlTsOLfUp6nzFKerD2A hm0vrRyIzGBukBk8NmZeuYXnqD5eBWBPGkgc8TYVQArxzRDp5nvv1pIZtqHH5FtarAdG V9NIAtrENyqgaVvuexQk5tGYxHqWhV/sYXF3FwtvQQetQuN8C5r9FLe+a3SVPXXFh2E6 gfTeWYg3NhOlIOuNIm9tvm9PBzmo0psPG4fBwPn2VbhirdRQBLW1PKmDCMWi8J88Svqx DJELg0KsLeggDNTfxISM13lv7vre8ZQZgHKmxFokwDFK9NY2njZL3166uG8krIQzSbk8 AVAQ== X-Gm-Message-State: AOAM531gtVI6wMJE9rM7H4YYSEXmRBv+Pj/YTZzplWJPle63dy1hW+uu Chz2oF3K2h6i8/l6YQnn+0cybKLR8LkFHA== X-Google-Smtp-Source: ABdhPJwWi9w3exmDWbtFzDinNE0jF88P2Mf+aNr9HMqjsxf/SBI0AuU0mXebJLW1ZYDEXCr0vo9CFw== X-Received: by 2002:a17:90b:4c42:: with SMTP id np2mr25773212pjb.201.1642432809964; Mon, 17 Jan 2022 07:20:09 -0800 (PST) Received: from localhost (218-173-149-51.dynamic-ip.hinet.net. [218.173.149.51]) by smtp.gmail.com with ESMTPSA id a9sm13889849pfo.169.2022.01.17.07.20.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 07:20:09 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 18/30][SRU][Jammy] UBUNTU: SAUCE: Fix build error for kernel 5.15 Date: Mon, 17 Jan 2022 23:19:16 +0800 Message-Id: <20220117151928.954829-19-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220117151928.954829-1-vicamo.yang@canonical.com> References: <20220117151928.954829-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.181; envelope-from=vicamo@gmail.com; helo=mail-pl1-f181.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ignacio Hernandez BugLink: https://bugs.launchpad.net/bugs/1955383 Signed-off-by: Ignacio Hernandez (cherry picked from commit 8659a022b39a23409c18341c3877689c0ce2ecb3 github.com/intel/ipu6-drivers) Signed-off-by: You-Sheng Yang --- drivers/media/pci/intel/ipu-bus.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/pci/intel/ipu-bus.c b/drivers/media/pci/intel/ipu-bus.c index 084aa5f946d0..d3b7f44c0e8a 100644 --- a/drivers/media/pci/intel/ipu-bus.c +++ b/drivers/media/pci/intel/ipu-bus.c @@ -119,15 +119,13 @@ static int ipu_bus_probe(struct device *dev) return rval; } -static int ipu_bus_remove(struct device *dev) +static void ipu_bus_remove(struct device *dev) { struct ipu_bus_device *adev = to_ipu_bus_device(dev); struct ipu_bus_driver *adrv = to_ipu_bus_driver(dev->driver); if (adrv->remove) adrv->remove(adev); - - return 0; } static struct bus_type ipu_bus = {