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 <[email protected]>
Acked-by: Dominik Brodowski <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
---
Split out of a series: [email protected].
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(-)
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;
--
2.40.0.1.gaa8946217a0b
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
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.
--
With Best Regards,
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?
--
With Best Regards,
Andy Shevchenko