Skip to content

Commit 5fe714f

Browse files
bjorn-helgaasbjorn-helgaas
committed
PCI: microchip: Rename mc_port to mc_pcie
Rename struct mc_port to mc_pcie to match the convention of <driver>_pcie. No functional change intended. Link: https://lore.kernel.org/r/20211223011054.1227810-16-helgaas@kernel.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Daire McNamara <daire.mcnamara@microchip.com>
1 parent d5a4835 commit 5fe714f

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

‎drivers/pci/controller/pcie-microchip-host.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ struct mc_msi {
262262
DECLARE_BITMAP(used, MC_NUM_MSI_IRQS);
263263
};
264264

265-
struct mc_port {
265+
struct mc_pcie {
266266
void __iomem *axi_base_addr;
267267
struct device *dev;
268268
struct irq_domain *intx_domain;
@@ -382,7 +382,7 @@ static struct {
382382

383383
static char poss_clks[][5] = { "fic0", "fic1", "fic2", "fic3" };
384384

385-
static void mc_pcie_enable_msi(struct mc_port *port, void __iomem *base)
385+
static void mc_pcie_enable_msi(struct mc_pcie *port, void __iomem *base)
386386
{
387387
struct mc_msi *msi = &port->msi;
388388
u32 cap_offset = MC_MSI_CAP_CTRL_OFFSET;
@@ -405,7 +405,7 @@ static void mc_pcie_enable_msi(struct mc_port *port, void __iomem *base)
405405

406406
static void mc_handle_msi(struct irq_desc *desc)
407407
{
408-
struct mc_port *port = irq_desc_get_handler_data(desc);
408+
struct mc_pcie *port = irq_desc_get_handler_data(desc);
409409
struct device *dev = port->dev;
410410
struct mc_msi *msi = &port->msi;
411411
void __iomem *bridge_base_addr =
@@ -428,7 +428,7 @@ static void mc_handle_msi(struct irq_desc *desc)
428428

429429
static void mc_msi_bottom_irq_ack(struct irq_data *data)
430430
{
431-
struct mc_port *port = irq_data_get_irq_chip_data(data);
431+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
432432
void __iomem *bridge_base_addr =
433433
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
434434
u32 bitpos = data->hwirq;
@@ -443,7 +443,7 @@ static void mc_msi_bottom_irq_ack(struct irq_data *data)
443443

444444
static void mc_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
445445
{
446-
struct mc_port *port = irq_data_get_irq_chip_data(data);
446+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
447447
phys_addr_t addr = port->msi.vector_phy;
448448

449449
msg->address_lo = lower_32_bits(addr);
@@ -470,7 +470,7 @@ static struct irq_chip mc_msi_bottom_irq_chip = {
470470
static int mc_irq_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,
471471
unsigned int nr_irqs, void *args)
472472
{
473-
struct mc_port *port = domain->host_data;
473+
struct mc_pcie *port = domain->host_data;
474474
struct mc_msi *msi = &port->msi;
475475
void __iomem *bridge_base_addr =
476476
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
@@ -503,7 +503,7 @@ static void mc_irq_msi_domain_free(struct irq_domain *domain, unsigned int virq,
503503
unsigned int nr_irqs)
504504
{
505505
struct irq_data *d = irq_domain_get_irq_data(domain, virq);
506-
struct mc_port *port = irq_data_get_irq_chip_data(d);
506+
struct mc_pcie *port = irq_data_get_irq_chip_data(d);
507507
struct mc_msi *msi = &port->msi;
508508

509509
mutex_lock(&msi->lock);
@@ -534,7 +534,7 @@ static struct msi_domain_info mc_msi_domain_info = {
534534
.chip = &mc_msi_irq_chip,
535535
};
536536

537-
static int mc_allocate_msi_domains(struct mc_port *port)
537+
static int mc_allocate_msi_domains(struct mc_pcie *port)
538538
{
539539
struct device *dev = port->dev;
540540
struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node);
@@ -562,7 +562,7 @@ static int mc_allocate_msi_domains(struct mc_port *port)
562562

563563
static void mc_handle_intx(struct irq_desc *desc)
564564
{
565-
struct mc_port *port = irq_desc_get_handler_data(desc);
565+
struct mc_pcie *port = irq_desc_get_handler_data(desc);
566566
struct device *dev = port->dev;
567567
void __iomem *bridge_base_addr =
568568
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
@@ -585,7 +585,7 @@ static void mc_handle_intx(struct irq_desc *desc)
585585

586586
static void mc_ack_intx_irq(struct irq_data *data)
587587
{
588-
struct mc_port *port = irq_data_get_irq_chip_data(data);
588+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
589589
void __iomem *bridge_base_addr =
590590
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
591591
u32 mask = BIT(data->hwirq + PM_MSI_INT_INTX_SHIFT);
@@ -595,7 +595,7 @@ static void mc_ack_intx_irq(struct irq_data *data)
595595

596596
static void mc_mask_intx_irq(struct irq_data *data)
597597
{
598-
struct mc_port *port = irq_data_get_irq_chip_data(data);
598+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
599599
void __iomem *bridge_base_addr =
600600
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
601601
unsigned long flags;
@@ -611,7 +611,7 @@ static void mc_mask_intx_irq(struct irq_data *data)
611611

612612
static void mc_unmask_intx_irq(struct irq_data *data)
613613
{
614-
struct mc_port *port = irq_data_get_irq_chip_data(data);
614+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
615615
void __iomem *bridge_base_addr =
616616
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
617617
unsigned long flags;
@@ -698,7 +698,7 @@ static u32 local_events(void __iomem *addr)
698698
return val;
699699
}
700700

701-
static u32 get_events(struct mc_port *port)
701+
static u32 get_events(struct mc_pcie *port)
702702
{
703703
void __iomem *bridge_base_addr =
704704
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
@@ -715,7 +715,7 @@ static u32 get_events(struct mc_port *port)
715715

716716
static irqreturn_t mc_event_handler(int irq, void *dev_id)
717717
{
718-
struct mc_port *port = dev_id;
718+
struct mc_pcie *port = dev_id;
719719
struct device *dev = port->dev;
720720
struct irq_data *data;
721721

@@ -731,7 +731,7 @@ static irqreturn_t mc_event_handler(int irq, void *dev_id)
731731

732732
static void mc_handle_event(struct irq_desc *desc)
733733
{
734-
struct mc_port *port = irq_desc_get_handler_data(desc);
734+
struct mc_pcie *port = irq_desc_get_handler_data(desc);
735735
unsigned long events;
736736
u32 bit;
737737
struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -748,7 +748,7 @@ static void mc_handle_event(struct irq_desc *desc)
748748

749749
static void mc_ack_event_irq(struct irq_data *data)
750750
{
751-
struct mc_port *port = irq_data_get_irq_chip_data(data);
751+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
752752
u32 event = data->hwirq;
753753
void __iomem *addr;
754754
u32 mask;
@@ -763,7 +763,7 @@ static void mc_ack_event_irq(struct irq_data *data)
763763

764764
static void mc_mask_event_irq(struct irq_data *data)
765765
{
766-
struct mc_port *port = irq_data_get_irq_chip_data(data);
766+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
767767
u32 event = data->hwirq;
768768
void __iomem *addr;
769769
u32 mask;
@@ -793,7 +793,7 @@ static void mc_mask_event_irq(struct irq_data *data)
793793

794794
static void mc_unmask_event_irq(struct irq_data *data)
795795
{
796-
struct mc_port *port = irq_data_get_irq_chip_data(data);
796+
struct mc_pcie *port = irq_data_get_irq_chip_data(data);
797797
u32 event = data->hwirq;
798798
void __iomem *addr;
799799
u32 mask;
@@ -881,7 +881,7 @@ static int mc_pcie_init_clks(struct device *dev)
881881
return 0;
882882
}
883883

884-
static int mc_pcie_init_irq_domains(struct mc_port *port)
884+
static int mc_pcie_init_irq_domains(struct mc_pcie *port)
885885
{
886886
struct device *dev = port->dev;
887887
struct device_node *node = dev->of_node;
@@ -957,7 +957,7 @@ static void mc_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
957957
}
958958

959959
static int mc_pcie_setup_windows(struct platform_device *pdev,
960-
struct mc_port *port)
960+
struct mc_pcie *port)
961961
{
962962
void __iomem *bridge_base_addr =
963963
port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
@@ -983,7 +983,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
983983
{
984984
struct device *dev = cfg->parent;
985985
struct platform_device *pdev = to_platform_device(dev);
986-
struct mc_port *port;
986+
struct mc_pcie *port;
987987
void __iomem *bridge_base_addr;
988988
void __iomem *ctrl_base_addr;
989989
int ret;

0 commit comments

Comments
 (0)