From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 C23003C6607 for ; Thu, 2 Apr 2026 11:43:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775130214; cv=none; b=ovUQ29KNzCDEmwYYfzkrchzIVmOQihnYNHWG19Ja6dN7uKnFvIkkJtFk/GyI1nPTpe/7X6KUbTkr7B1N85IuvMFxr0Ou//xjDMCTf09164tOs1kiu6jzDOvA/XU2yIuJhWGqjOLAJzgD/banTaVLz/GvcPpCKx//05c8r9swJDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775130214; c=relaxed/simple; bh=gY7HQ300MO0CkpLIn/GZpMCQ/jOuQ/Egue7d3Mkk4X8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TZ1S9l0tkQ9lqwC7tJm4iwkDxlxT6+HnQ87NmOzX0BHOCnzoTZdpr1yVZ0SlFx3lhL/07z6LQJOuS/mDnhRZdZYaacaO/pQFR505DVwtMkhkKfFFvwFoOgQ6xPeqf7Y/W63n+tA/7x4JI5RSBgSYxsUX/mXIuagjFFAmn7fVTGQ= 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=oMcJkCtZ; arc=none smtp.client-ip=209.85.214.169 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="oMcJkCtZ" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2b240d753ceso1999555ad.3 for ; Thu, 02 Apr 2026 04:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775130204; x=1775735004; 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=BWfaZDglV+5Mmp6GJdkcLBtTlrEQHvz96dOIQDefcZo=; b=oMcJkCtZYyVn9rSYyimff8rMxwXuOFEByBm2U9+8KqemJIskE7ZL2veoKx49Gq59pI gjOtQ8UEXIpxkXy31XTXCXv1LgcLNExJFzSTJeL60/fe5hCiA1NrRqAMxa6mNSUTQN48 VU9jTTPFDZ+LC31QePpxtRXv99grNEllk4R7CcrY0DBvePgA/P/l3c1xCKFC0GJRK6rb cjtwl45cYYqdbasKqficodLKxUfkg7T7W0an9yKaqiJUw87LFRy2mvre1IGtC6q+7K62 fmTz9dgIdTU4ah/HVR1b5SC3UJOWUNgZ45DdK29P/1wNq+srfP8HfSzOF85rn9Y/PPg+ CUtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775130204; x=1775735004; 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=BWfaZDglV+5Mmp6GJdkcLBtTlrEQHvz96dOIQDefcZo=; b=RQdLQd1vUTbpzikeR3kpb5mFoYGmd1qE+6fSKKpYaEu0xHeJ5F6AUyUfSRrh873+2W ZETgl3xIkurXsChZVJu/CN6wcOKtPkIJ3ttoa2Zl0VvFzZlgV5WgnOkDJ2d4sRF02Rl2 P+gfs2FIonfvsksk+5jvkRt1RBq1+s5E8Is1jxd+ui8yzKwXSCUQlLDNACzL+POf/Td2 +jh0H4D0Z2soAIflHL0r06Fm49BBKDYAnw2K7ci7ciQwau4wMcafZC27tgQalgDfbAoY vZchxNug1zpz7PCqOU0BglqwtOLHdae3kTv3rLeAYRpC+cYisZD3M/dJk/AomzpPixRe skBg== X-Forwarded-Encrypted: i=1; AJvYcCWgblEk5m8yocxEEjzfTLSJayr9u/MOhceTuwymfmy2PFOFGZywT/vjqvPPr+FrnffNqxuwC+IcIk5D68g=@vger.kernel.org X-Gm-Message-State: AOJu0YyHH0rGInnQlo0dsRCidcn4vnmOzAnVBQFwEfVtTeh3OMChsMph amV+reirWLO6S8qWI39QkRc8GAI5qAlajFK9HK16nynL9iyxCwRORNkl X-Gm-Gg: AeBDies4U/x2CwyaZNFAd87A4BL6WkgEDIwUlKnl/bUJT5oDr+SP39SfSpUzu4XNhdr 1L7V2XR8fXLIsuhTwOnd45IJG7U2E2zfjvS4bFY0xerwXQqB2Covbo44dfmz2wD1w/AEiXkXv/M 9YsKLg4SL1hSUw7aIylgMrBQUsC965W/DD7ogGJbY9meRmgA4gLgIKmTUtG/H0ptlpxd+PMFmxZ NXNyGbkKlXCngLjZllrWKUm42/o8mrsQBLdOgY/zsN9bq1Mh7H6LDIRM5clhCSe0MMUmj7qCPrv 4DkcPWFMoWhggPNN03PIYJ2GACHhsB8mjFQuHEDDOWCWgqU/dJ/dZihhZ0lvEqcgIHJcm4jF4g3 wKsT2Y17ZXxRPjJ5EVWi4YnAsZheuqopNg6BNGzlnExcJ6OxoJdZQpOcvpHse/Pzalqlp3Nv3O5 Um5kh2A7buVDrDmBLMKuL3wCTNoQ== X-Received: by 2002:a17:903:1b6c:b0:2ae:63fd:6d6a with SMTP id d9443c01a7336-2b269d66be7mr44945625ad.7.1775130203649; Thu, 02 Apr 2026 04:43:23 -0700 (PDT) Received: from fedora ([2401:4900:85cc:66d7:5e4d:2506:ea1:a781]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b274779b48sm37505805ad.25.2026.04.02.04.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 04:43:23 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v3 1/2] staging: octeon: ethernet-spi: replace pr_err with dev_err Date: Thu, 2 Apr 2026 17:12:41 +0530 Message-ID: <20260402114242.57411-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402114242.57411-1-ayushmukkanwar@gmail.com> References: <20260402114242.57411-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: 8bit 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 netdev pointer in request_irq and free_irq. Signed-off-by: Ayush Mukkanwar --- drivers/staging/octeon/ethernet-spi.c | 78 +++++++++++++-------------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c index 699c98c5ec13..1e33544f74b8 100644 --- a/drivers/staging/octeon/ethernet-spi.c +++ b/drivers/staging/octeon/ethernet-spi.c @@ -17,67 +17,62 @@ static int number_spi_ports; static int need_retrain[2] = { 0, 0 }; -static void cvm_oct_spxx_int_pr(union cvmx_spxx_int_reg spx_int_reg, int index) +static void cvm_oct_spxx_int_pr(struct net_device *dev, union cvmx_spxx_int_reg spx_int_reg, + int index) { if (spx_int_reg.s.spf) - pr_err("SPI%d: SRX Spi4 interface down\n", index); + netdev_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); + netdev_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_CTL[ERRCNT]\n", - index); + netdev_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); + netdev_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", - index); + netdev_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", - index); + netdev_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", - index); + netdev_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", - index); + netdev_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); + netdev_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", - index); + netdev_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); + netdev_err(dev, "SPI%d: SRX Port out of range\n", index); } -static void cvm_oct_stxx_int_pr(union cvmx_stxx_int_reg stx_int_reg, int index) +static void cvm_oct_stxx_int_pr(struct net_device *dev, + union cvmx_stxx_int_reg stx_int_reg, int index) { if (stx_int_reg.s.syncerr) - pr_err("SPI%d: STX Interface encountered a fatal error\n", - index); + netdev_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", - index); + netdev_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); + netdev_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", - index); + netdev_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", - index); + netdev_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); + netdev_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); + netdev_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", - index, 1); + netdev_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", - index, 0); + netdev_err(dev, "SPI%d: STX Calendar Table Parity Error Bank%d\n", index, 0); } -static irqreturn_t cvm_oct_spi_spx_int(int index) +static irqreturn_t cvm_oct_spi_spx_int(struct net_device *dev, int index) { union cvmx_spxx_int_reg spx_int_reg; union cvmx_stxx_int_reg stx_int_reg; @@ -86,14 +81,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 &= cvmx_read_csr(CVMX_SPXX_INT_MSK(index)); - cvm_oct_spxx_int_pr(spx_int_reg, index); + cvm_oct_spxx_int_pr(dev, spx_int_reg, index); } stx_int_reg.u64 = 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 &= cvmx_read_csr(CVMX_STXX_INT_MSK(index)); - cvm_oct_stxx_int_pr(stx_int_reg, index); + cvm_oct_stxx_int_pr(dev, stx_int_reg, index); } cvmx_write_csr(CVMX_SPXX_INT_MSK(index), 0); @@ -107,14 +102,15 @@ static irqreturn_t cvm_oct_spi_rml_interrupt(int cpl, void *dev_id) { irqreturn_t return_status = IRQ_NONE; union cvmx_npi_rsl_int_blocks rsl_int_blocks; + struct net_device *dev = dev_id; /* Check and see if this interrupt was caused by the GMX block */ rsl_int_blocks.u64 = cvmx_read_csr(CVMX_NPI_RSL_INT_BLOCKS); if (rsl_int_blocks.s.spx1) /* 19 - SPX1_INT_REG & STX1_INT_REG */ - return_status = cvm_oct_spi_spx_int(1); + return_status = cvm_oct_spi_spx_int(dev, 1); if (rsl_int_blocks.s.spx0) /* 18 - SPX0_INT_REG & STX0_INT_REG */ - return_status = cvm_oct_spi_spx_int(0); + return_status = cvm_oct_spi_spx_int(dev, 0); return return_status; } @@ -196,7 +192,7 @@ int cvm_oct_spi_init(struct net_device *dev) if (number_spi_ports == 0) { r = request_irq(OCTEON_IRQ_RML, cvm_oct_spi_rml_interrupt, - IRQF_SHARED, "SPI", &number_spi_ports); + IRQF_SHARED, "SPI", dev); if (r) return r; } @@ -221,6 +217,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); } } -- 2.53.0