From nobody Wed Apr 1 13:57:35 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 274C33C9EE5 for ; Tue, 31 Mar 2026 11:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774955918; cv=none; b=dUBd1jW3tCn3FK+v8/fzjnrW2MYf7ihJY1Ok6kgv0VZA79uFOlt+4p3gQYuvoIo/jf0J0/fMlPVtrpvOECDMhz6WVIsQrBLkMBAXkFVB1lULZai4aUyBQMjnbhB2B5NcDy3OK/QNbaMbBKQA5PsqRxK1Cj4srebkwlDXX6PrU90= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774955918; c=relaxed/simple; bh=Z2YR+tZdX3Dcaybg8rMXhSIMzylnB/xkHjP3i8NFxBk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n6YsG/LtIa6HOy6eOrIHs6z+zebIBrIjRACpW8nGmz6kcl1dk4YgNHlNAMzChMNfGLbPBpVhu5qFZYsEoz0xlrbUwgIpTrWuJAUbjuzBJup+f0VoQ779HO9CYsUx6syd+ULocNH/HQfN8Yl+++di/shpsah8Ig1J9kNsKTB5X9I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cg/lVHNf; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cg/lVHNf" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-35c12651da5so349766a91.2 for ; Tue, 31 Mar 2026 04:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774955916; x=1775560716; darn=vger.kernel.org; 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=h1LnjjT0zj6RitOJEhyCSuLJgKMaIyJC1rDVJFN9rQk=; b=cg/lVHNfi40bPKNGnowlvSJ47GamSfYGWoCT6iQqViqX49D9Dmb0G82ELW+eHTC6MF 0tHr9w0SBNFr8jCzxyknZzsflJqwTQcXgHiPZnAJIKc1/Ggc3C9c6/d7tZiXU/4xrCZ3 XWG89oqH/K4KiXyuRi0fcw8AZ6TRYAZi+cd5wGkIA+DmG7/zSnFuCDuF1RXQntHBni7S nimJegvn6IOzIMOdRyGa1raK1afBk26U8K2/JoVLfuX2WHWoGq1c1N+O0ViAztAuBT96 pnpR+eI8DRZfNA/x8zh3pd+c4y6U2xngAQQkt9Nizbnp43JspAI2scEoWi+bgx2f/mXk aVHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774955916; x=1775560716; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=h1LnjjT0zj6RitOJEhyCSuLJgKMaIyJC1rDVJFN9rQk=; b=Zpxt0Uhw0TkFFyNOKMwi5dNDYoSHSjpoBQyk+6un1WE+mbkKLhw8P/AxMKze0pMxy+ Aj28CSDSzE5vh/zbuJ4P4qX0AftarNouPViAy1t+VWptNb+OvpKbS1RuQpUPWFSBDGZO Ono9rLdDKi4Au7Phc0/+dAk8RLg3V98Hd0uAbe7EZUyzfti/10Xy80vqLKYs+YtukAkj QRAVRUMgJINqYtURbkPVV6pf7TMMvu09wpJyxkDg9i4vsVVUmPKTbH65PRy2xdWk70wx nJ5yd0RA6eoIfRb6ZuUeNj5G6i3QMdyQtNkz6Pb2L0yA87QFMu7/z2+ecVNVE7kBtmNt 87Cg== X-Forwarded-Encrypted: i=1; AJvYcCVNgO5Br+ZoY8dS7AJjucSLs//i79w9Ov+/Ts74f9x2tRBf0/A6PFaAPkgIxki+a7w1XIunGrMSPoSNSZQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwBacnW+nt2qy3r86rvVxrxY0j6jfQgwZ6/aHyP7i5W8rpLijSg 8JL5N2VbyzUqRL1aZ1vML80Ng7n0alPjGqoxrBw/GrA/FBHVwz9R6RVUlW//v0oF X-Gm-Gg: ATEYQzytKVwlREM9V3ehNp83WJafo++f0/g4xbL+ZsBgxRZnWb0h0DHVJKx/CNTARuN xHifTiaT8F0iGCVGq3RWsVmANGI7yhd6sUTKFaiyGgI0i2dNGihAZMzXjHU0dx0BukHwGeGCTt8 sSH+0KG4XUlOKP54qJ5waIfWixh2HWqV/Gk49gd5EHPhzZykEQeSVbsRoOUhrXd4A6iDPPj1UQJ te/rFpW28tliu7c2x9SRjF9XzSxijSoMouQIMAV1iss56+oZOwQBOJIcxngePlHCtQcFEDhkUBC kg4xJM2NfCoklseOHVbqJKRTWH7oDuZEBc4/fRGHUjiI7k6VUFhbeeGSYrWXi2t3+jCeNBlMzA2 pnXTtk93D801x4Ud9lI+MnKnPlTetYI0WtdlV02qw/YTysyuudLR8dY+r+moj0sh5EVv+9jBwpp tMiO2ZoOKZ8xPnxWsNCSHPK+ZxxqU= X-Received: by 2002:a17:902:fb0d:b0:2b2:4194:952a with SMTP id d9443c01a7336-2b2419496f0mr55383125ad.6.1774955916369; Tue, 31 Mar 2026 04:18:36 -0700 (PDT) Received: from fedora ([2401:4900:86e0:ee11:14b4:e5e5:9799:983f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b242766203sm128901145ad.40.2026.03.31.04.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 04:18:36 -0700 (PDT) From: AyushMukkanwar To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, AyushMukkanwar Subject: [PATCH v2 1/2] staging: octeon: ethernet-spi: replace pr_err with dev_err Date: Tue, 31 Mar 2026 16:47:56 +0530 Message-ID: <20260331111757.110703-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331111757.110703-1-ayushmukkanwar@gmail.com> References: <2026033119-endpoint-jimmy-6b83@gregkh> <20260331111757.110703-1-ayushmukkanwar@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace pr_err() calls with dev_err() to include device information in log messages. The device pointer is passed through the interrupt handler via dev_id, which is changed from &number_spi_ports to dev->dev.parent in request_irq and free_irq. Signed-off-by: AyushMukkanwar --- drivers/staging/octeon/ethernet-spi.c | 59 ++++++++++++++------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon= /ethernet-spi.c index 699c98c5ec13..8c02920c3cdc 100644 --- a/drivers/staging/octeon/ethernet-spi.c +++ b/drivers/staging/octeon/ethernet-spi.c @@ -17,67 +17,67 @@ static int number_spi_ports; static int need_retrain[2] =3D { 0, 0 }; =20 -static void cvm_oct_spxx_int_pr(union cvmx_spxx_int_reg spx_int_reg, int i= ndex) +static void cvm_oct_spxx_int_pr(union cvmx_spxx_int_reg spx_int_reg, int i= ndex, struct device *dev) { if (spx_int_reg.s.spf) - pr_err("SPI%d: SRX Spi4 interface down\n", index); + dev_err(dev, "SPI%d: SRX Spi4 interface down\n", index); if (spx_int_reg.s.calerr) - pr_err("SPI%d: SRX Spi4 Calendar table parity error\n", index); + dev_err(dev, "SPI%d: SRX Spi4 Calendar table parity error\n", index); if (spx_int_reg.s.syncerr) - pr_err("SPI%d: SRX Consecutive Spi4 DIP4 errors have exceeded SPX_ERR_CT= L[ERRCNT]\n", + dev_err(dev, "SPI%d: SRX Consecutive Spi4 DIP4 errors have exceeded SPX_= ERR_CTL[ERRCNT]\n", index); if (spx_int_reg.s.diperr) - pr_err("SPI%d: SRX Spi4 DIP4 error\n", index); + dev_err(dev, "SPI%d: SRX Spi4 DIP4 error\n", index); if (spx_int_reg.s.tpaovr) - pr_err("SPI%d: SRX Selected port has hit TPA overflow\n", + dev_err(dev, "SPI%d: SRX Selected port has hit TPA overflow\n", index); if (spx_int_reg.s.rsverr) - pr_err("SPI%d: SRX Spi4 reserved control word detected\n", + dev_err(dev, "SPI%d: SRX Spi4 reserved control word detected\n", index); if (spx_int_reg.s.drwnng) - pr_err("SPI%d: SRX Spi4 receive FIFO drowning/overflow\n", + dev_err(dev, "SPI%d: SRX Spi4 receive FIFO drowning/overflow\n", index); if (spx_int_reg.s.clserr) - pr_err("SPI%d: SRX Spi4 packet closed on non-16B alignment without EOP\n= ", + dev_err(dev, "SPI%d: SRX Spi4 packet closed on non-16B alignment without= EOP\n", index); if (spx_int_reg.s.spiovr) - pr_err("SPI%d: SRX Spi4 async FIFO overflow\n", index); + dev_err(dev, "SPI%d: SRX Spi4 async FIFO overflow\n", index); if (spx_int_reg.s.abnorm) - pr_err("SPI%d: SRX Abnormal packet termination (ERR bit)\n", + dev_err(dev, "SPI%d: SRX Abnormal packet termination (ERR bit)\n", index); if (spx_int_reg.s.prtnxa) - pr_err("SPI%d: SRX Port out of range\n", index); + dev_err(dev, "SPI%d: SRX Port out of range\n", index); } =20 -static void cvm_oct_stxx_int_pr(union cvmx_stxx_int_reg stx_int_reg, int i= ndex) +static void cvm_oct_stxx_int_pr(union cvmx_stxx_int_reg stx_int_reg, int i= ndex, struct device *dev) { if (stx_int_reg.s.syncerr) - pr_err("SPI%d: STX Interface encountered a fatal error\n", + dev_err(dev, "SPI%d: STX Interface encountered a fatal error\n", index); if (stx_int_reg.s.frmerr) - pr_err("SPI%d: STX FRMCNT has exceeded STX_DIP_CNT[MAXFRM]\n", + dev_err(dev, "SPI%d: STX FRMCNT has exceeded STX_DIP_CNT[MAXFRM]\n", index); if (stx_int_reg.s.unxfrm) - pr_err("SPI%d: STX Unexpected framing sequence\n", index); + dev_err(dev, "SPI%d: STX Unexpected framing sequence\n", index); if (stx_int_reg.s.nosync) - pr_err("SPI%d: STX ERRCNT has exceeded STX_DIP_CNT[MAXDIP]\n", + dev_err(dev, "SPI%d: STX ERRCNT has exceeded STX_DIP_CNT[MAXDIP]\n", index); if (stx_int_reg.s.diperr) - pr_err("SPI%d: STX DIP2 error on the Spi4 Status channel\n", + dev_err(dev, "SPI%d: STX DIP2 error on the Spi4 Status channel\n", index); if (stx_int_reg.s.datovr) - pr_err("SPI%d: STX Spi4 FIFO overflow error\n", index); + dev_err(dev, "SPI%d: STX Spi4 FIFO overflow error\n", index); if (stx_int_reg.s.ovrbst) - pr_err("SPI%d: STX Transmit packet burst too big\n", index); + dev_err(dev, "SPI%d: STX Transmit packet burst too big\n", index); if (stx_int_reg.s.calpar1) - pr_err("SPI%d: STX Calendar Table Parity Error Bank%d\n", + dev_err(dev, "SPI%d: STX Calendar Table Parity Error Bank%d\n", index, 1); if (stx_int_reg.s.calpar0) - pr_err("SPI%d: STX Calendar Table Parity Error Bank%d\n", + dev_err(dev, "SPI%d: STX Calendar Table Parity Error Bank%d\n", index, 0); } =20 -static irqreturn_t cvm_oct_spi_spx_int(int index) +static irqreturn_t cvm_oct_spi_spx_int(int index, struct device *dev) { union cvmx_spxx_int_reg spx_int_reg; union cvmx_stxx_int_reg stx_int_reg; @@ -86,14 +86,14 @@ static irqreturn_t cvm_oct_spi_spx_int(int index) cvmx_write_csr(CVMX_SPXX_INT_REG(index), spx_int_reg.u64); if (!need_retrain[index]) { spx_int_reg.u64 &=3D cvmx_read_csr(CVMX_SPXX_INT_MSK(index)); - cvm_oct_spxx_int_pr(spx_int_reg, index); + cvm_oct_spxx_int_pr(spx_int_reg, index, dev); } =20 stx_int_reg.u64 =3D cvmx_read_csr(CVMX_STXX_INT_REG(index)); cvmx_write_csr(CVMX_STXX_INT_REG(index), stx_int_reg.u64); if (!need_retrain[index]) { stx_int_reg.u64 &=3D cvmx_read_csr(CVMX_STXX_INT_MSK(index)); - cvm_oct_stxx_int_pr(stx_int_reg, index); + cvm_oct_stxx_int_pr(stx_int_reg, index, dev); } =20 cvmx_write_csr(CVMX_SPXX_INT_MSK(index), 0); @@ -107,14 +107,15 @@ static irqreturn_t cvm_oct_spi_rml_interrupt(int cpl,= void *dev_id) { irqreturn_t return_status =3D IRQ_NONE; union cvmx_npi_rsl_int_blocks rsl_int_blocks; + struct device *dev =3D dev_id; =20 /* Check and see if this interrupt was caused by the GMX block */ rsl_int_blocks.u64 =3D cvmx_read_csr(CVMX_NPI_RSL_INT_BLOCKS); if (rsl_int_blocks.s.spx1) /* 19 - SPX1_INT_REG & STX1_INT_REG */ - return_status =3D cvm_oct_spi_spx_int(1); + return_status =3D cvm_oct_spi_spx_int(1, dev); =20 if (rsl_int_blocks.s.spx0) /* 18 - SPX0_INT_REG & STX0_INT_REG */ - return_status =3D cvm_oct_spi_spx_int(0); + return_status =3D cvm_oct_spi_spx_int(0, dev); =20 return return_status; } @@ -196,7 +197,7 @@ int cvm_oct_spi_init(struct net_device *dev) =20 if (number_spi_ports =3D=3D 0) { r =3D request_irq(OCTEON_IRQ_RML, cvm_oct_spi_rml_interrupt, - IRQF_SHARED, "SPI", &number_spi_ports); + IRQF_SHARED, "SPI", dev->dev.parent); if (r) return r; } @@ -221,6 +222,6 @@ void cvm_oct_spi_uninit(struct net_device *dev) cvmx_write_csr(CVMX_SPXX_INT_MSK(interface), 0); cvmx_write_csr(CVMX_STXX_INT_MSK(interface), 0); } - free_irq(OCTEON_IRQ_RML, &number_spi_ports); + free_irq(OCTEON_IRQ_RML, dev->dev.parent); } } --=20 2.53.0