From patchwork Mon Nov 11 11:38:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 11236799 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B79F14E5 for ; Mon, 11 Nov 2019 11:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59585214DB for ; Mon, 11 Nov 2019 11:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bORSX6lU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726943AbfKKLix (ORCPT ); Mon, 11 Nov 2019 06:38:53 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50745 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726791AbfKKLix (ORCPT ); Mon, 11 Nov 2019 06:38:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573472332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwWbKAicByQ7caf+4UMVGlXXUwIVp5v2QMtoVjYuVEo=; b=bORSX6lUDsn105mhDruU61244zhuF7te9cPooYlytSWog4xhvp9u/XGUuFb31upDAMUHXS m5qrSzwKvDkAU4LMVgVB+IO8+b0Puzp5TWiqGV6ldoST+S4mZuRy+dh13s2fAMf959GbSn VMvYKt3hY0Wodigg0oHKBETZDj4AAKs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-Nt4mKNmhMKKKZIUUB4C3ng-1; Mon, 11 Nov 2019 06:38:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 631EB801E68; Mon, 11 Nov 2019 11:38:49 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-117-121.ams2.redhat.com [10.36.117.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FF4219C4F; Mon, 11 Nov 2019 11:38:48 +0000 (UTC) From: Hans de Goede To: Greg Kroah-Hartman Cc: Hans de Goede , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, youling257 Subject: [PATCH 1/2] staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids Date: Mon, 11 Nov 2019 12:38:45 +0100 Message-Id: <20191111113846.24940-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: Nt4mKNmhMKKKZIUUB4C3ng-1 X-Mimecast-Spam-Score: 0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add 024c:0525 to the list of SDIO device-ids, based on a patch found in the Android X86 kernels. According to that patch this device id is used on the Alcatel Plus 10 device. Reported-and-tested-by: youling257 Signed-off-by: Hans de Goede --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c index 12f683e2e0e2..c48d2df97285 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -18,6 +18,7 @@ static const struct sdio_device_id sdio_ids[] = { { SDIO_DEVICE(0x024c, 0x0523), }, + { SDIO_DEVICE(0x024c, 0x0525), }, { SDIO_DEVICE(0x024c, 0x0623), }, { SDIO_DEVICE(0x024c, 0x0626), }, { SDIO_DEVICE(0x024c, 0xb723), }, From patchwork Mon Nov 11 11:38:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 11236801 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5E941864 for ; Mon, 11 Nov 2019 11:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5090214DB for ; Mon, 11 Nov 2019 11:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Muh5Q/Wh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726949AbfKKLiy (ORCPT ); Mon, 11 Nov 2019 06:38:54 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36177 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726843AbfKKLix (ORCPT ); Mon, 11 Nov 2019 06:38:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573472332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H+Di3Kl/jO6R1/yj5/OK39qxfLJcA5U247p2Yowc9hI=; b=Muh5Q/WhXDuRTsTsaJasg4WFgBw1RBV3Tv59K3UZN0469Mm18SoDJQpF5o6OtkZbHfq6J6 e3NJNZv/9arsB6NMWcgv1AlbOLdxVl1o8mALhsKOqxe2LSZfqrJXuoqnCZxy/fs3L7p7l0 QvHPAwl/HZS+UgEfAo+K2r1JcQmekJM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-8pWTqUvPOjWFJDZgpVej_A-1; Mon, 11 Nov 2019 06:38:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D646800D49; Mon, 11 Nov 2019 11:38:50 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-117-121.ams2.redhat.com [10.36.117.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC82119C4F; Mon, 11 Nov 2019 11:38:49 +0000 (UTC) From: Hans de Goede To: Greg Kroah-Hartman Cc: Hans de Goede , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 2/2] staging: rtl8723bs: Drop ACPI device ids Date: Mon, 11 Nov 2019 12:38:46 +0100 Message-Id: <20191111113846.24940-2-hdegoede@redhat.com> In-Reply-To: <20191111113846.24940-1-hdegoede@redhat.com> References: <20191111113846.24940-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 8pWTqUvPOjWFJDZgpVej_A-1 X-Mimecast-Spam-Score: 0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The driver only binds by SDIO device-ids, all the ACPI device-id does is causing the driver to load unnecessarily on devices where the DSDT contains a bogus OBDA8723 device. Signed-off-by: Hans de Goede --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c index c48d2df97285..859f4a0afb95 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -24,13 +24,7 @@ static const struct sdio_device_id sdio_ids[] = { SDIO_DEVICE(0x024c, 0xb723), }, { /* end: all zeroes */ }, }; -static const struct acpi_device_id acpi_ids[] = { - {"OBDA8723", 0x0000}, - {} -}; - MODULE_DEVICE_TABLE(sdio, sdio_ids); -MODULE_DEVICE_TABLE(acpi, acpi_ids); static int rtw_drv_init(struct sdio_func *func, const struct sdio_device_id *id); static void rtw_dev_remove(struct sdio_func *func);