From patchwork Thu Apr 25 17:08:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 792215 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75F4414D715; Thu, 25 Apr 2024 17:09:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714064947; cv=none; b=ppdsEuy3XlavmuvgaruTRkYHwd6OK+PGxdlNr+eBLn3maxSVnYS2nFAxQGn5sLdG4bHGB9g3+aWHXHFEwuguTMMopvTe1ql5TnTVArXYr5wVmX593LKLCz8CKJG9I5BM961PyN/2jHz5oIwi+YIV3atl6mRUqyKHnM3kqRcPybw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714064947; c=relaxed/simple; bh=6/9sO9GFWOtUcX+qVb91FNhPTDtt7A0IxEGeFO8MRB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iO1+xY/6Tw9reBz+O2f5k9X7mx0CfWPjTutbimMSQCnnU8MEIAt9ezd+Jv3TUd65V3wwSFabh5BbF78GXYLhPkOnQLkkOYLMlzkgjhKoQCzXcM3MDJSJ7B95E3kB/qt/hLVNnedW4NMIa//0cvJTRisWXkm07raqijUcy2OkHVE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=G0wJE4FD; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="G0wJE4FD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714064945; x=1745600945; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6/9sO9GFWOtUcX+qVb91FNhPTDtt7A0IxEGeFO8MRB4=; b=G0wJE4FD/ivUUbPUSvKijy1PWJvCvYf7Mc661OYLS/lh01XTOlb0RjKe VX0VcRuVFrNcikS8f1fMP8OUbgCNO0dJQD7nz1BdQa49p5y8z2W5cVHom FNsplYaerm+9itDGmJTzZqlpakszKMDFWcnRp/DBaCNxTGGpbb2rL4kdQ VlbyCklkQdpDmPNpqgqieLHbOYFBd2QmY/9TTU1m3O8pj2LL2DMHQpLt1 1k6r/uNhJwHsR68j6JE59D6jaEGwz++xfjkkx8cyAV0DOZuaZ72w1WaMC zlRh3aGTzecBuQMGLkBYZgl+yBcGxFQydHIZR33tH/XDLHemoGUOnH9Ij A==; X-CSE-ConnectionGUID: gitWnEPmQf+5QA7n+6KKpA== X-CSE-MsgGUID: aDIIDwXeRkuNFOkdhTHA4A== X-IronPort-AV: E=McAfee;i="6600,9927,11055"; a="13554447" X-IronPort-AV: E=Sophos;i="6.07,230,1708416000"; d="scan'208";a="13554447" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2024 10:09:04 -0700 X-CSE-ConnectionGUID: A7RDrk70SrC9wW9Ti6eYng== X-CSE-MsgGUID: b3d9/hPPTBuJlM+wJhImhQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,230,1708416000"; d="scan'208";a="29595990" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa005.fm.intel.com with ESMTP; 25 Apr 2024 10:09:02 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8343787; Thu, 25 Apr 2024 20:09:01 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Aubin Constans , Ulf Hansson , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea Subject: [PATCH v2 1/2] mmc: atmel-mci: Incapsulate used to be a platform data into host structure Date: Thu, 25 Apr 2024 20:08:44 +0300 Message-ID: <20240425170900.3767990-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240425170900.3767990-1-andriy.shevchenko@linux.intel.com> References: <20240425170900.3767990-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 After platform data is gone, we always allocate memory for the slot information. Incapsulate the array of the latter into the host structure, so we allocate memory only once. This makes code simpler. Signed-off-by: Andy Shevchenko --- drivers/mmc/host/atmel-mci.c | 61 ++++++++++++++---------------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 3aed57c392fa..9ae3ce14db50 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -224,14 +224,6 @@ struct mci_slot_pdata { bool non_removable; }; -/** - * struct mci_platform_data - board-specific MMC/SDcard configuration - * @slot: Per-slot configuration data. - */ -struct mci_platform_data { - struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS]; -}; - struct atmel_mci_caps { bool has_dma_conf_reg; bool has_pdc; @@ -297,6 +289,7 @@ struct atmel_mci_dma { * @mapbase: Physical address of the MMIO registers. * @mck: The peripheral bus clock hooked up to the MMC controller. * @dev: Device associated with the MMC controller. + * @pdata: Per-slot configuration data. * @slot: Slots sharing this MMC controller. * @caps: MCI capabilities depending on MCI version. * @prepare_data: function to setup MCI before data transfer which @@ -375,6 +368,7 @@ struct atmel_mci { struct clk *mck; struct device *dev; + struct mci_slot_pdata pdata[ATMCI_MAX_NR_SLOTS]; struct atmel_mci_slot *slot[ATMCI_MAX_NR_SLOTS]; struct atmel_mci_caps caps; @@ -630,11 +624,11 @@ static const struct of_device_id atmci_dt_ids[] = { MODULE_DEVICE_TABLE(of, atmci_dt_ids); -static struct mci_platform_data *atmci_of_init(struct device *dev) +static int atmci_of_init(struct atmel_mci *host) { + struct device *dev = host->dev; struct device_node *np = dev->of_node; struct device_node *cnp; - struct mci_platform_data *pdata; u32 slot_id; int err; @@ -643,10 +637,6 @@ static struct mci_platform_data *atmci_of_init(struct device *dev) return ERR_PTR(-EINVAL); } - pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) - return ERR_PTR(-ENOMEM); - for_each_child_of_node(np, cnp) { if (of_property_read_u32(cnp, "reg", &slot_id)) { dev_warn(dev, "reg property is missing for %pOF\n", cnp); @@ -661,38 +651,38 @@ static struct mci_platform_data *atmci_of_init(struct device *dev) } if (of_property_read_u32(cnp, "bus-width", - &pdata->slot[slot_id].bus_width)) - pdata->slot[slot_id].bus_width = 1; + &host->pdata[slot_id].bus_width)) + host->pdata[slot_id].bus_width = 1; - pdata->slot[slot_id].detect_pin = + host->pdata[slot_id].detect_pin = devm_fwnode_gpiod_get(dev, of_fwnode_handle(cnp), "cd", GPIOD_IN, "cd-gpios"); - err = PTR_ERR_OR_ZERO(pdata->slot[slot_id].detect_pin); + err = PTR_ERR_OR_ZERO(host->pdata[slot_id].detect_pin); if (err) { if (err != -ENOENT) { of_node_put(cnp); - return ERR_PTR(err); + return err; } - pdata->slot[slot_id].detect_pin = NULL; + host->pdata[slot_id].detect_pin = NULL; } - pdata->slot[slot_id].non_removable = + host->pdata[slot_id].non_removable = of_property_read_bool(cnp, "non-removable"); - pdata->slot[slot_id].wp_pin = + host->pdata[slot_id].wp_pin = devm_fwnode_gpiod_get(dev, of_fwnode_handle(cnp), "wp", GPIOD_IN, "wp-gpios"); - err = PTR_ERR_OR_ZERO(pdata->slot[slot_id].wp_pin); + err = PTR_ERR_OR_ZERO(host->pdata[slot_id].wp_pin); if (err) { if (err != -ENOENT) { of_node_put(cnp); - return ERR_PTR(err); + return err; } - pdata->slot[slot_id].wp_pin = NULL; + host->pdata[slot_id].wp_pin = NULL; } } - return pdata; + return 0; } static inline unsigned int atmci_get_version(struct atmel_mci *host) @@ -2456,7 +2446,6 @@ static void atmci_get_cap(struct atmel_mci *host) static int atmci_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct mci_platform_data *pdata; struct atmel_mci *host; struct resource *regs; unsigned int nr_slots; @@ -2467,12 +2456,6 @@ static int atmci_probe(struct platform_device *pdev) if (!regs) return -ENXIO; - pdata = atmci_of_init(dev); - if (IS_ERR(pdata)) { - dev_err(dev, "platform data not available\n"); - return PTR_ERR(pdata); - } - irq = platform_get_irq(pdev, 0); if (irq < 0) return irq; @@ -2485,6 +2468,10 @@ static int atmci_probe(struct platform_device *pdev) spin_lock_init(&host->lock); INIT_LIST_HEAD(&host->queue); + ret = atmci_of_init(host); + if (ret) + return dev_err_probe(dev, ret, "Slot information not available\n"); + host->mck = devm_clk_get(dev, "mci_clk"); if (IS_ERR(host->mck)) return PTR_ERR(host->mck); @@ -2544,16 +2531,16 @@ static int atmci_probe(struct platform_device *pdev) /* We need at least one slot to succeed */ nr_slots = 0; ret = -ENODEV; - if (pdata->slot[0].bus_width) { - ret = atmci_init_slot(host, &pdata->slot[0], + if (host->pdata[0].bus_width) { + ret = atmci_init_slot(host, &host->pdata[0], 0, ATMCI_SDCSEL_SLOT_A, ATMCI_SDIOIRQA); if (!ret) { nr_slots++; host->buf_size = host->slot[0]->mmc->max_req_size; } } - if (pdata->slot[1].bus_width) { - ret = atmci_init_slot(host, &pdata->slot[1], + if (host->pdata[1].bus_width) { + ret = atmci_init_slot(host, &host->pdata[1], 1, ATMCI_SDCSEL_SLOT_B, ATMCI_SDIOIRQB); if (!ret) { nr_slots++; From patchwork Thu Apr 25 17:08:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 792523 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A309B14D719; Thu, 25 Apr 2024 17:09:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714064947; cv=none; b=kG252/c4TlpSkeF3cjsVSDCtAMnMCyXFkqUeNbkM+XZRGaHjPdBtuYgFanWnXOqXTgSVSChjhhzvr8EBwoofZz92XzJYsMPaoy6OQ6c4sVT4xn8n1n3T9ha6Lzbg/Qz2GnivmzsJ9we36wJRAoibDaLDhvaAnctBJdn1o31Qgi0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714064947; c=relaxed/simple; bh=Poecu4f5dpmnBhjDNs+GIeQe2EIjAchr4YDeOe285sY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FTNAsaWlHisZFKz/qK/kuqXEX2tqNH+FHZtT2D4GKBGZdHvfXxcnHrWQELxAMsA1CksBOnTk7wJw61WxymbM21lH2V+Dd5uCwkRDgM8QBJZFi8gYENebngJ0G8JFrrGFRlOEo/bH2D+rvok6AeLVVsZlaveMeHgY8uQhNdkkq7g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=jkWbr/6p; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="jkWbr/6p" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714064945; x=1745600945; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Poecu4f5dpmnBhjDNs+GIeQe2EIjAchr4YDeOe285sY=; b=jkWbr/6pVf+q7nDAdAkQ5Sbbg7NIYIansS9XocwBXSe6K+BBUmJwfB+U 0AIDbs6iXFHtJC8zY8dtEdBlCBT9LM6OB5T8Yp3EPRvPRD4LKrwDbEC8T 9HV/vZ6rgGIkkRYQua1T0hzG498ygeQa6CIGAbNOIWXs3+0TsvacqcyNv wctkMNaJacGCQBKkUt6nm/D/Q/1vRQR7erPRGS4+cpMHHa59nIZr4qwss ouxI2oSm8YubxN89h0q7opeuqweooH+I36oMoA17pTtAjq/zrK7A/pKrR Rv+T40HpDAFmdzuiMMVW8zJI2k2tA3N+4KnNTvtm5WqTk4pDImBlIEfZz w==; X-CSE-ConnectionGUID: dXvqx40WQyCbbmFekygugw== X-CSE-MsgGUID: 0Sqye04VRG+EEohv0dpnyw== X-IronPort-AV: E=McAfee;i="6600,9927,11055"; a="9618905" X-IronPort-AV: E=Sophos;i="6.07,230,1708416000"; d="scan'208";a="9618905" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2024 10:09:04 -0700 X-CSE-ConnectionGUID: LqkwhMLARgq9KjVdNaAqPw== X-CSE-MsgGUID: X+Lavs6MTwqvEI8THCiJtg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,230,1708416000"; d="scan'208";a="29945986" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa004.jf.intel.com with ESMTP; 25 Apr 2024 10:09:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8B5E75B2; Thu, 25 Apr 2024 20:09:01 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Aubin Constans , Ulf Hansson , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea Subject: [PATCH v2 2/2] mmc: atmel-mci: Switch to use dev_err_probe() Date: Thu, 25 Apr 2024 20:08:45 +0300 Message-ID: <20240425170900.3767990-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240425170900.3767990-1-andriy.shevchenko@linux.intel.com> References: <20240425170900.3767990-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Switch to use dev_err_probe() to simplify the error path and unify a message template. Signed-off-by: Andy Shevchenko --- drivers/mmc/host/atmel-mci.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 9ae3ce14db50..8199d9620075 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -632,10 +632,8 @@ static int atmci_of_init(struct atmel_mci *host) u32 slot_id; int err; - if (!np) { - dev_err(dev, "device node not found\n"); - return ERR_PTR(-EINVAL); - } + if (!np) + return dev_err_probe(dev, -EINVAL, "device node not found\n"); for_each_child_of_node(np, cnp) { if (of_property_read_u32(cnp, "reg", &slot_id)) { @@ -2551,7 +2549,7 @@ static int atmci_probe(struct platform_device *pdev) } if (!nr_slots) { - dev_err(dev, "init failed: no slot defined\n"); + dev_err_probe(dev, ret, "init failed: no slot defined\n"); goto err_init_slot; } @@ -2560,8 +2558,7 @@ static int atmci_probe(struct platform_device *pdev) &host->buf_phys_addr, GFP_KERNEL); if (!host->buffer) { - ret = -ENOMEM; - dev_err(dev, "buffer allocation failed\n"); + ret = dev_err_probe(dev, -ENOMEM, "buffer allocation failed\n"); goto err_dma_alloc; } }