mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 16/21] PCI: Drop "ops" from struct pci_bus
Date: Wed,  9 Jan 2019 20:57:34 -0800	[thread overview]
Message-ID: <20190110045739.19399-17-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190110045739.19399-1-andrew.smirnov@gmail.com>

Drop "ops" from struct pci_bus, since the same struct can be accessed
via host->pci_ops. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/pci/pci.c       | 6 ++----
 drivers/pci/pci_iomap.c | 2 +-
 include/linux/pci.h     | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 78c0daffcd..c34b918453 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -46,7 +46,6 @@ void register_pci_controller(struct pci_controller *hose)
 	hose->bus = bus;
 	bus->parent = hose->parent;
 	bus->host = hose;
-	bus->ops = hose->pci_ops;
 	bus->resource[PCI_BUS_RESOURCE_MEM] = hose->mem_resource;
 	bus->resource[PCI_BUS_RESOURCE_MEM_PREF] = hose->mem_pref_resource;
 	bus->resource[PCI_BUS_RESOURCE_IO] = hose->io_resource;
@@ -83,7 +82,7 @@ int pci_bus_read_config_##size \
 	int res;							\
 	u32 data = 0;							\
 	if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;	\
-	res = bus->ops->read(bus, devfn, pos, len, &data);		\
+	res = bus->host->pci_ops->read(bus, devfn, pos, len, &data);	\
 	*value = (type)data;						\
 	return res;							\
 }
@@ -94,7 +93,7 @@ int pci_bus_write_config_##size \
 {									\
 	int res;							\
 	if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;	\
-	res = bus->ops->write(bus, devfn, pos, len, value);		\
+	res = bus->host->pci_ops->write(bus, devfn, pos, len, value);	\
 	return res;							\
 }
 
@@ -418,7 +417,6 @@ static unsigned int pci_scan_bus(struct pci_bus *bus)
 			child_bus = pci_alloc_bus();
 			/* inherit parent properties */
 			child_bus->host = bus->host;
-			child_bus->ops = bus->host->pci_ops;
 			child_bus->parent_bus = bus;
 			child_bus->resource[PCI_BUS_RESOURCE_MEM] =
 				bus->resource[PCI_BUS_RESOURCE_MEM];
diff --git a/drivers/pci/pci_iomap.c b/drivers/pci/pci_iomap.c
index a56f61dc1a..2c58c0c0f9 100644
--- a/drivers/pci/pci_iomap.c
+++ b/drivers/pci/pci_iomap.c
@@ -24,6 +24,6 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar)
 	struct pci_bus *bus = dev->bus;
 	resource_size_t start = pci_resource_start(dev, bar);
 
-	return (void *)bus->ops->res_start(bus, start);
+	return (void *)bus->host->pci_ops->res_start(bus, start);
 }
 EXPORT_SYMBOL(pci_iomap);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a519a9dc81..b609a1330b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -131,8 +131,6 @@ struct pci_bus {
 	struct list_head devices;	/* list of devices on this bus */
 	struct resource *resource[PCI_BRIDGE_RESOURCE_NUM];
 
-	struct pci_ops	*ops;		/* configuration access functions */
-
 	unsigned char	number;		/* bus number */
 	unsigned char	primary;	/* number of primary bridge */
 	unsigned char	secondary;	/* number of secondary bridge */
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-01-10  4:58 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-10  4:57 [PATCH 00/21] PCI improvements Andrey Smirnov
2019-01-10  4:57 ` [PATCH 01/21] PCI: Switch to using %pa to print memory addresses Andrey Smirnov
2019-01-10  4:57 ` [PATCH 02/21] PCI: Replace last_* variables with an array Andrey Smirnov
2019-01-10  4:57 ` [PATCH 03/21] PCI: Consolidate limit/base settting code Andrey Smirnov
2019-01-10  4:57 ` [PATCH 04/21] PCI: Convert prescan_setup_bridge() to use a loop Andrey Smirnov
2019-01-10  4:57 ` [PATCH 05/21] PCI: Convert postscan_setup_bridge() " Andrey Smirnov
2019-01-10 10:09   ` Sascha Hauer
2019-01-10 19:16     ` Andrey Smirnov
2019-01-11 10:47       ` Sascha Hauer
2019-01-12  2:34         ` Andrey Smirnov
2019-01-10  4:57 ` [PATCH 06/21] PCI: Replace magic number in setup_device() Andrey Smirnov
2019-01-10  4:57 ` [PATCH 07/21] PCI: Remove superfluous parens " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 08/21] PCI: Simplify resource setup code " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 09/21] PCI: Store and reuse BAR offsets Andrey Smirnov
2019-01-10  4:57 ` [PATCH 10/21] PCI: Conver register_pci_controller() to use a loop Andrey Smirnov
2019-01-10  4:57 ` [PATCH 11/21] PCI: Remove unused variables/code Andrey Smirnov
2019-01-10  4:57 ` [PATCH 12/21] PCI: Make pci_scan_bus static Andrey Smirnov
2019-01-10  4:57 ` [PATCH 13/21] PCI: Drop "slots" from struct pci_bus Andrey Smirnov
2019-01-10  4:57 ` [PATCH 14/21] PCI: Drop "resources" " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 15/21] PCI: Drop "name" " Andrey Smirnov
2019-01-10  4:57 ` Andrey Smirnov [this message]
2019-01-10  4:57 ` [PATCH 17/21] PCI: Drop "rom_address" from struct pci_dev Andrey Smirnov
2019-01-10  4:57 ` [PATCH 18/21] PCI: Simplify alloc_pci_dev() Andrey Smirnov
2019-01-10  4:57 ` [PATCH 19/21] PCI: Assume 1:1 mapping if .res_start callback is NULL Andrey Smirnov
2019-01-10  4:57 ` [PATCH 20/21] PCI: Convert ->res_start() to return resource_size_t Andrey Smirnov
2019-01-10  4:57 ` [PATCH 21/21] PCI: Consify pci_ops in struct pci_controller Andrey Smirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190110045739.19399-17-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox