From patchwork Mon Jul 1 15:25:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Schrock X-Patchwork-Id: 13718314 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24C4716C86B for ; Mon, 1 Jul 2024 15:27:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719847643; cv=none; b=p0f8zBsNzEbx6JrZ5+0DSfWa33Ts4oP7HojMLau5ZPPYHyJNw2X0CIs/qO5A4HxMh0xBDq2XxIYSkAsyT54LLYnut30LMt8P2Fbsqxk2HqVD5BlpXmUUu+TsxOlo35QWb9pJGZwR+1U7MVmIxnZ4HsRqWdfvOaFNTPj5w3+LTVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719847643; c=relaxed/simple; bh=kwhSqC4sGAfMjjHfE324cad5Y4x7wB/6xaRkHuW7Jy8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mUnpGU0v5qUDV/hmwQDAl8lOHIChaPeayhZSUN11HFtLk2vtbUN+LjqFf0/c9wZ1Ko6+iZINtehNacF8CenZKmPw9k3PJQowxGZTotLXgXatx36v/jEc5O6vY4pfwSaAnCIRhCaXQaQn3Jeb7JBf3elHdJsrhbTHGj7CuieMX5g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com; spf=pass smtp.mailfrom=getcruise.com; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=mY0LC0Py; arc=none smtp.client-ip=209.85.210.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=getcruise.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="mY0LC0Py" Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-7021f23d699so3666a34.3 for ; Mon, 01 Jul 2024 08:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; s=google; t=1719847641; x=1720452441; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=H1QJ8uP5Hz+TGbb9BK4aSEGrb1z9qI4focRuPPcQh2g=; b=mY0LC0PyPsNGbVrnu/DfNE91Hzlma2pGCp+7ouX5gQPPwtMjKKc2HEDWWepT9ckvon s3c1UoUyFliNHZEGnv6rjvAPld5pXIeNLpJAv+NEJGnanlcEMCAoIXZspD3YxzHsd8XH Ftsn/psq1OcYY84EVuArvKWsiT2CeDs/3kIs+6WoTpC+Ehm6Lm5XWv07UrufEwi1b5Dh ztZ075vHqe0viDRXUKPWRe0PmTlE1tLUOwfG9Ntm1BCTwdPSaQ6JNzJJoJ5T+FK+nZ29 SwaIV47eFdfVKEOv/FOPL1o2KFOkJblXmtlz4SUwznTKO3EJ+EGf+TyACOX5eHnTTHp7 AetA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719847641; x=1720452441; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=H1QJ8uP5Hz+TGbb9BK4aSEGrb1z9qI4focRuPPcQh2g=; b=W2HDJ/yd9yqSfzS85GXtod9tcGBOJcij6Tvf3I5cEdF13vp/WBCJWRdXHj15CveQFM piR7MCSrUcXPL2DoDr101ARdCVAfMi43x/whpvrdUUppreHRNgO/41vJc+Mydpq+mTxU TKEBSSbPodxgLxrgTtCC2kIWegZnxwN+w+G35tTH15tg4zNe5N3iuLD9H3T2bzBLDSZy IBZ0U62PTUK+1JrF5/VUUF7ajr02DLtITNloh5NPlw91czB/KvWTy9HRvkDFub1WIUSn QyeHcfmN+4OZMfrYthbgvg0vz/Ggq0JlfHpW0Y1lipsCo/2O6ZqBRYwQ13uuw0fIS6R1 lTqg== X-Gm-Message-State: AOJu0YyWh6LfF5kHBWD2C7t+6T+MSxfMfH1sohh0VTGYoV9IQ81aIOsN e6Mhgsw8oAKINzvDjpolkzQk1V75ibgh0odUkMmw1jp/0qzzYTnwe+6OlmNicMTkW7zKTSdjwjA buZuXeK0f1c26PYC+woK2VTmhDqpmfex6JFSyEzASdG7fIPkBu/W5RnkbjvIZHkHKaFzFk9QX77 kEQt+l4RbZ4brSPvxUaQtTsV58E+Db675PQ7Qbt8am0dxZ7w== X-Google-Smtp-Source: AGHT+IEr8r6XysCE6h18Dc1WRugxQwKx2JQyL6KoxX1ahs8dB6OjJxZkIEifVtb6vB91TD+Hlo4R9g== X-Received: by 2002:a05:6830:1e8b:b0:700:d6d7:8f26 with SMTP id 46e09a7af769-702075f4abdmr6888210a34.10.1719847640902; Mon, 01 Jul 2024 08:27:20 -0700 (PDT) Received: from localhost.localdomain ([140.177.136.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69262ab7sm356212085a.26.2024.07.01.08.27.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 08:27:20 -0700 (PDT) From: Steve Schrock To: ofono@lists.linux.dev Cc: Steve Schrock Subject: [PATCH 1/3] udevng: Remove Modem setting from setup_gobi Date: Mon, 1 Jul 2024 15:25:49 +0000 Message-ID: <20240701152553.23072-1-steve.schrock@getcruise.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 gobi doesn't actually use the "Modem" setting since it communicates using the qmi protocol. The fact that setup_gobi required this interface actually caused certain modems to fail inside setup_gobi since mdm was not being set. --- plugins/udevng.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index 789592e6ec99..271d43b16336 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -355,7 +355,6 @@ static gboolean setup_gobi(struct modem_info *modem) { const struct device_info *qmi = NULL; const struct device_info *net = NULL; - const char *mdm = NULL; const char *gps = NULL; const char *diag = NULL; GSList *list; @@ -381,30 +380,25 @@ static gboolean setup_gobi(struct modem_info *modem) diag = info->devnode; /* ec20 */ else if (g_strcmp0(info->number, "01") == 0) diag = info->devnode; /* gobi */ - else if (g_strcmp0(info->number, "02") == 0) - mdm = info->devnode; /* gobi */ else if (g_strcmp0(info->number, "03") == 0) gps = info->devnode; /* gobi */ } else if (g_strcmp0(info->interface, "255/0/0") == 0) { if (g_strcmp0(info->number, "01") == 0) gps = info->devnode; /* ec20 */ - if (g_strcmp0(info->number, "02") == 0) - mdm = info->devnode; /* ec20 */ /* ignore the 3rd device second AT/mdm iface */ } } } - if (qmi == NULL || mdm == NULL || net == NULL) + if (qmi == NULL || net == NULL) return FALSE; - DBG("qmi=%s net=%s mdm=%s gps=%s diag=%s", - qmi->devnode, get_ifname(net), mdm, gps, diag); + DBG("qmi=%s net=%s gps=%s diag=%s", + qmi->devnode, get_ifname(net), gps, diag); if (setup_qmi_qmux(modem, qmi, net) < 0) return FALSE; - ofono_modem_set_string(modem->modem, "Modem", mdm); ofono_modem_set_string(modem->modem, "Diag", diag); return TRUE; From patchwork Mon Jul 1 15:25:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Schrock X-Patchwork-Id: 13718315 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E27953AC for ; Mon, 1 Jul 2024 15:28:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719847698; cv=none; b=RV9nvwCqqLWTqk22XJAiwUvIzrWxq3j5oHx+f8tbokdwxvoN61wv6iqCE13FJLw+82DOs94MXqC5veO+KjGy3cl/PgQn1zYdEG4faFlNWQZJvjVppe1Z7q+nmEXGHqkrR0dTTISf0TQeIXuibnlGykhAldu6ZyQbNfISWcN/BXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719847698; c=relaxed/simple; bh=hgTnWPOTcmTw0EfDR1xN3ufxpHEWmSS+VcrNGlCG+Pk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GRMyrgcLCMg3LYxOYnm4+YqoFVO7y0cIx2JzVDxbvIsDRhH3fpXB32MMbk7bUyTuzmBAc3XuTB8SHZ1hTIUkqAmxGjJgQhG4O4F1IBH+BpnaxZd3OrEyKOE4cQnXKP5JUDkqDTYOWaWtIJz5gu336kU0aCvjqRLFOSY0VdjVjWY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com; spf=pass smtp.mailfrom=getcruise.com; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=EDbY5vcf; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=getcruise.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="EDbY5vcf" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-79c0b73b109so216429285a.1 for ; Mon, 01 Jul 2024 08:28:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; s=google; t=1719847695; x=1720452495; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KQCkjpUdLRHvnCnzzgA4OJR1c+kA7ECQAgr2kzXfGIk=; b=EDbY5vcf1pXtGtal7U+xEclF7NAMiyR3aX4rnW6ew6gMQonUBrPd0UjlA5DcD+ojB+ /xGJKM63BiFK9d0vHMYda5861hMaXT74MK0onBmhItR/vUtE3flEUW2nXoBzv1QTl6T1 Mog8XkSrOOJyGoHStyFPBnDieQ0MTk+dQ1jhdXadTaLLvylWnAucxpfj/wyhOqy9TyVV 0Kx18bpZrPBkw8ARiWWjBWf2V5jXssJxZfcGZ+kUc3IENOPi5mMVUAVoMUvalrWCW7Wg cw9rM4vw/qk8wbhQfPjMfb4Qjdeq1IsxpJcw0vXE+9utw4gQgWiz7w18sSDBH3Mh5FiG h3Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719847695; x=1720452495; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KQCkjpUdLRHvnCnzzgA4OJR1c+kA7ECQAgr2kzXfGIk=; b=A3q1A07gnrTTOawmwqS5WUWb7/LbbY+qZzrxsdo/ZnUpI8HC1WGWEdkzJhV2PkfaWS CalPcGmmxiNZD87FC7rgBcwp1Smhdu5YYfgH/iqv9/dVHckeBHvrrq+C9f5qkqQwcA0O cvKk/rX94t+MZgkjro6dCd8rwXIV3X0njdr8rE2TFALShRECABsKZw+XfbNMpK4MZgi4 RqMCI46kfl54npiC0TkGPX3h60WHAWeLxSrSzIkjP2TNCwypiMBEY65AkNyI0JIS1O8e AR8pTZt4guCJh2YLogHNXNcKlTNV+3DuqX/qvsn/QkDLr8ME+DYjrBLyngv1tXl+5Tdr bmBQ== X-Gm-Message-State: AOJu0YwJSzH/fR9p2DOYJRcT3HnIf8lmv8sDuuY9XgIuBSXOZ7r9/3Hy 2N9Lpc3qcXi3LZj6686b/mdPGou9uqBR1KdtuNV080u2AUYoXtdlRr5gbepzUtZWUE4/k7/869h u0W42aZRrAWbUICK2u6KLg+SZgJODOr1WqiDQmC33WXzav1i9Vtdi7keVWDjqlcV06IE9CwIE+c MUj6vGqSwkpl4Y9t1nnZZLPsaPI/OM83Sy4DRCLXNDQ0WAwg== X-Google-Smtp-Source: AGHT+IGeQL9hWxllu89fu3LlOJSHIyBLQdk45JBf0bYaBVmt3IPqFtkl1X66PSKIe43O5IBZ/TZS0A== X-Received: by 2002:a05:620a:112d:b0:79d:79cb:2a5f with SMTP id af79cd13be357-79d7babe241mr782912985a.63.1719847695427; Mon, 01 Jul 2024 08:28:15 -0700 (PDT) Received: from localhost.localdomain ([140.177.136.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69262ab7sm356212085a.26.2024.07.01.08.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 08:28:15 -0700 (PDT) From: Steve Schrock To: ofono@lists.linux.dev Cc: Steve Schrock Subject: [PATCH 2/3] udevng: Remove Diag setting from setup_gobi Date: Mon, 1 Jul 2024 15:25:50 +0000 Message-ID: <20240701152553.23072-2-steve.schrock@getcruise.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240701152553.23072-1-steve.schrock@getcruise.com> References: <20240701152553.23072-1-steve.schrock@getcruise.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 gobi does not use the Diag setting. --- plugins/udevng.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index 271d43b16336..8e116c6605ea 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -356,7 +356,6 @@ static gboolean setup_gobi(struct modem_info *modem) const struct device_info *qmi = NULL; const struct device_info *net = NULL; const char *gps = NULL; - const char *diag = NULL; GSList *list; DBG("%s", modem->syspath); @@ -376,11 +375,7 @@ static gboolean setup_gobi(struct modem_info *modem) net = info; else if (g_strcmp0(subsystem, "tty") == 0) { if (g_strcmp0(info->interface, "255/255/255") == 0) { - if (g_strcmp0(info->number, "00") == 0) - diag = info->devnode; /* ec20 */ - else if (g_strcmp0(info->number, "01") == 0) - diag = info->devnode; /* gobi */ - else if (g_strcmp0(info->number, "03") == 0) + if (g_strcmp0(info->number, "03") == 0) gps = info->devnode; /* gobi */ } else if (g_strcmp0(info->interface, "255/0/0") == 0) { if (g_strcmp0(info->number, "01") == 0) @@ -393,14 +388,12 @@ static gboolean setup_gobi(struct modem_info *modem) if (qmi == NULL || net == NULL) return FALSE; - DBG("qmi=%s net=%s gps=%s diag=%s", - qmi->devnode, get_ifname(net), gps, diag); + DBG("qmi=%s net=%s gps=%s", + qmi->devnode, get_ifname(net), gps); if (setup_qmi_qmux(modem, qmi, net) < 0) return FALSE; - ofono_modem_set_string(modem->modem, "Diag", diag); - return TRUE; } From patchwork Mon Jul 1 15:25:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Schrock X-Patchwork-Id: 13718316 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BBF8F16132E for ; Mon, 1 Jul 2024 15:28:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719847699; cv=none; b=p0fU+e6CZygnIOux77jiFmJ+sVHk8HxncBBE4QeO8p3mmtxDXPQV/edm251f/hyYn8hi2/z111P4OsI+4n8EOuZOB+GAm+aPnvr2jrLpuVN/oym89unFm2c2pPOiqNB6anBW7/+a9zYw5hrmyw/+06+CVmAVMoWPmc+L0owRTGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719847699; c=relaxed/simple; bh=hDuG6az/CDlgNYY4vDQGXPf5XbeQmzcpifDsYUMmBeI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sjX4lW+RomhoOLnh1RdyIyNSyPHvZp5c8q4a1t0Kb86CXsyrHS0UC5WKbf5P5JkFmdx281LDcXx1dM7YSedx61iAMTqSmWUVwhJcW7HWuz3MXucOfhod760qWB1S+i8Qy7aUCff5UnL+1tBkdPqPP3z62NtA1R3cVnuxWLwKRaU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com; spf=pass smtp.mailfrom=getcruise.com; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=PgXyHw9B; arc=none smtp.client-ip=209.85.222.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=getcruise.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="PgXyHw9B" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-79c05c19261so188584685a.0 for ; Mon, 01 Jul 2024 08:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; s=google; t=1719847696; x=1720452496; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hyw7nmPcRlQ8LrDegL8oS2H3/nQU0GgrHw6aZ4AWiQc=; b=PgXyHw9B/Yid/oiafMYRC0Q4bcuwJHRKBt7lZP1g9a+qEkpR7XATR5MJY2Jh4zdgua jCbgabp4kJA1xmSo8BLHF4wtluCt6ja0/KVTG/phRO2LSYOJZfVlUqO2i6FlRfv0oLSQ 2hUaU55aGZyd5IYfERCTVU723ai6dpjkrYJIuh5vBrEdiXFuZas8FI4haZ1HryYSrgij eDYcu42lJx53yWCSaB/EkftDdYX1gDdyZL5oCsfsskVnIveOwERRVzQVkyjrtNY7rAhg sWb2JEPpkvVqMv3HFEMnwXu42Osy02hNeowN0mHAgsxKGdMeSQAfQ7N6qOYs6drsNdH+ u+ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719847696; x=1720452496; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hyw7nmPcRlQ8LrDegL8oS2H3/nQU0GgrHw6aZ4AWiQc=; b=SKbk4CFUN/A7tmw1M935uLv2NkX6msndcz3YlRcyyUQLMB6ZwtbgGvX42CQwhkwLe3 z5MHe8ncAuGSrrY0BN/HM5pXti4ZWIbl8Vg47ijnH2yiqncvOK/ullmI+xqYrUCKLhW0 7SHS2j8NWEI/XuVhh8OsfpKEkQrk2PUlVXWV6Xx9gVdt3IhsF2iiq7MOgdXw3XnDcP+O asWZp9gVQRuwFAJCTDw6vpwTJ35m4aPvietJocodZ2AC6wKoFI9buTEHUs5qiA9vJrCg k+SNN9mZcd0aORivQPZ2Txj6aalAIK9mua3NjnOy7F3KEg3jZ5n+9FTjmEvb12w1MFsN 2Alg== X-Gm-Message-State: AOJu0YyjdCyCSevmgmBc6vqf97UdApYQhHhX/x/TloipjNR6pt9Pz62Y AA7CLm1PEjh6eR/e3iKyah/6C+m7qegmQVixMYNs8iQHx6OFoIeKu8gX6i+qhIRqPVR0LxHDOkD vd9kcu0niuVQ3FG/vHOlgQFqSxUicZU6BcDOhFCgTs6aj7iVyhtDXQ5B9CZMD0lEyh/iQEy4aed dMCI8n5iidMnQiW+h/8/Zfeo/aMAaW+3YyZ7TwGX5xKf6gcA== X-Google-Smtp-Source: AGHT+IGQWJDh023jfLQ+boh/Fh2Clwb1nzAQVfz+j/TfFI+ptUCRJS+vOHBxIHtkB3x6CoVQLk0W3w== X-Received: by 2002:a05:620a:4483:b0:79d:5779:fe72 with SMTP id af79cd13be357-79d7b9b0e78mr789331585a.1.1719847696477; Mon, 01 Jul 2024 08:28:16 -0700 (PDT) Received: from localhost.localdomain ([140.177.136.50]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d69262ab7sm356212085a.26.2024.07.01.08.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 08:28:15 -0700 (PDT) From: Steve Schrock To: ofono@lists.linux.dev Cc: Steve Schrock Subject: [PATCH 3/3] udevng: Remove gps from setup_gobi Date: Mon, 1 Jul 2024 15:25:51 +0000 Message-ID: <20240701152553.23072-3-steve.schrock@getcruise.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240701152553.23072-1-steve.schrock@getcruise.com> References: <20240701152553.23072-1-steve.schrock@getcruise.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Even when the gps variable was set, it was not actually used for anything. --- plugins/udevng.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index 8e116c6605ea..1c56e2ea62d3 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -355,7 +355,6 @@ static gboolean setup_gobi(struct modem_info *modem) { const struct device_info *qmi = NULL; const struct device_info *net = NULL; - const char *gps = NULL; GSList *list; DBG("%s", modem->syspath); @@ -373,23 +372,12 @@ static gboolean setup_gobi(struct modem_info *modem) qmi = info; else if (g_strcmp0(subsystem, "net") == 0) /* wwan */ net = info; - else if (g_strcmp0(subsystem, "tty") == 0) { - if (g_strcmp0(info->interface, "255/255/255") == 0) { - if (g_strcmp0(info->number, "03") == 0) - gps = info->devnode; /* gobi */ - } else if (g_strcmp0(info->interface, "255/0/0") == 0) { - if (g_strcmp0(info->number, "01") == 0) - gps = info->devnode; /* ec20 */ - /* ignore the 3rd device second AT/mdm iface */ - } - } } if (qmi == NULL || net == NULL) return FALSE; - DBG("qmi=%s net=%s gps=%s", - qmi->devnode, get_ifname(net), gps); + DBG("qmi=%s net=%s", qmi->devnode, get_ifname(net)); if (setup_qmi_qmux(modem, qmi, net) < 0) return FALSE;