diff mbox series

[v1,1/1] pcmcia: Convert to use less arguments in pci_bus_for_each_resource()

Message ID 20231030115053.2752588-1-andriy.shevchenko@linux.intel.com
State New
Headers
Series [v1,1/1] pcmcia: Convert to use less arguments in pci_bus_for_each_resource() |

Commit Message

Andy Shevchenko Oct. 30, 2023, 11:50 a.m. UTC 
  The pci_bus_for_each_resource() can hide the iterator loop since
it may be not used otherwise. With this, we may drop that iterator
variable definition.

Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---

 Split out of a series: 20230330162434.35055-1-andriy.shevchenko@linux.intel.com.

 Fixed the second hunk in nonstatic_autoadd_resources() to avoid
 potential breakage.

 drivers/pcmcia/rsrc_nonstatic.c | 6 +++---
 drivers/pcmcia/yenta_socket.c   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

Comments

Andy Shevchenko Feb. 1, 2024, 3:17 p.m. UTC | #1 
On Mon, Oct 30, 2023 at 01:50:53PM +0200, Andy Shevchenko wrote:
> The pci_bus_for_each_resource() can hide the iterator loop since
> it may be not used otherwise. With this, we may drop that iterator
> variable definition.

Can it be now applied?
Dominik Brodowski Feb. 1, 2024, 4:19 p.m. UTC | #2 
Am Thu, Feb 01, 2024 at 05:17:11PM +0200 schrieb Andy Shevchenko:
> On Mon, Oct 30, 2023 at 01:50:53PM +0200, Andy Shevchenko wrote:
> > The pci_bus_for_each_resource() can hide the iterator loop since
> > it may be not used otherwise. With this, we may drop that iterator
> > variable definition.
> 
> Can it be now applied?

Which tree will this go through? No need to involve the PCMCIA tree, and you
already have my ACK...

Best,
	Dominik
Andy Shevchenko Feb. 1, 2024, 4:22 p.m. UTC | #3 
On Thu, Feb 01, 2024 at 05:19:17PM +0100, Dominik Brodowski wrote:
> Am Thu, Feb 01, 2024 at 05:17:11PM +0200 schrieb Andy Shevchenko:
> > On Mon, Oct 30, 2023 at 01:50:53PM +0200, Andy Shevchenko wrote:
> > > The pci_bus_for_each_resource() can hide the iterator loop since
> > > it may be not used otherwise. With this, we may drop that iterator
> > > variable definition.
> > 
> > Can it be now applied?
> 
> Which tree will this go through? No need to involve the PCMCIA tree, and you
> already have my ACK...

I believe PCI one, okay, seems like I have to resend with Bjorn being included.
diff mbox series

Patch

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index bf9d070a4496..39da2ad9d0b2 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -934,7 +934,7 @@  static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
 static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
 {
 	struct resource *res;
-	int i, done = 0;
+	int done = 0;
 
 	if (!s->cb_dev || !s->cb_dev->bus)
 		return -ENODEV;
@@ -961,10 +961,10 @@  static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
 	if (s->cb_dev->bus->number == 0)
 		return -EINVAL;
 
-	for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
+	for (unsigned int i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
 		res = s->cb_dev->bus->resource[i];
 #else
-	pci_bus_for_each_resource(s->cb_dev->bus, res, i) {
+	pci_bus_for_each_resource(s->cb_dev->bus, res) {
 #endif
 		if (!res)
 			continue;
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 1365eaa20ff4..fd18ab571ce8 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -673,9 +673,8 @@  static int yenta_search_res(struct yenta_socket *socket, struct resource *res,
 			    u32 min)
 {
 	struct resource *root;
-	int i;
 
-	pci_bus_for_each_resource(socket->dev->bus, root, i) {
+	pci_bus_for_each_resource(socket->dev->bus, root) {
 		if (!root)
 			continue;