From patchwork Mon Oct 19 18:56:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 11844931 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 61CCF16BC for ; Mon, 19 Oct 2020 18:56:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39FE3223C6 for ; Mon, 19 Oct 2020 18:56:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aZ1h9+7Y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730955AbgJSS4g (ORCPT ); Mon, 19 Oct 2020 14:56:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22601 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727681AbgJSS4g (ORCPT ); Mon, 19 Oct 2020 14:56:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603133795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mNEI/SsVg1ZSRb+yHosHyixrz1+xy27J+IyNlaCs2Nw=; b=aZ1h9+7Y1eKqwiYRyOajxKA37ZMcdbJ5vQBJhw1kSxQNYy51POcaD9f4WXTmgg/zDniRDT ds5Q7LXdc5e3a/ddsD0/xmg3K3Q8SRTdruDe4UiEu59Vstq5dbDPzcIXw8cJ++w/1+FJzX +70sxvjKvxOpxv3WbjthIvSym9HJFMg= 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-455-Z15lmP-vMUiyTGrRBYoObg-1; Mon, 19 Oct 2020 14:56:33 -0400 X-MC-Unique: Z15lmP-vMUiyTGrRBYoObg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A848CADC31; Mon, 19 Oct 2020 18:56:32 +0000 (UTC) Received: from x1.localdomain (ovpn-114-62.ams2.redhat.com [10.36.114.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8400360DA0; Mon, 19 Oct 2020 18:56:29 +0000 (UTC) From: Hans de Goede To: Mark Gross , Lee Chun-Yi Cc: Hans de Goede , Andy Shevchenko , platform-driver-x86@vger.kernel.org Subject: [PATCH 1/6] platform/x86: acer-wmi: Drop no-op set_quirks call from find_quirks Date: Mon, 19 Oct 2020 20:56:23 +0200 Message-Id: <20201019185628.264473-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org set_quirks has a "if (!interface) return;" check at its beginning and interface always is NULL when set_quirks is called from find_quirks, so it is a no-op and we can drop it. This also allows dropping the "if (!interface) return;" from set_quirks since set_quirks now always is called with interface != NULL. Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko --- drivers/platform/x86/acer-wmi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 49f4b73be513..db6167a10981 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -302,9 +302,6 @@ static struct quirk_entry *quirks; static void __init set_quirks(void) { - if (!interface) - return; - if (quirks->mailled) interface->capability |= ACER_CAP_MAILLED; @@ -648,8 +645,6 @@ static void __init find_quirks(void) if (quirks == NULL) quirks = &quirk_unknown; - - set_quirks(); } /*