Commit 180594f5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/microchip' 

- Make several microchip symbols static (Wei Yongjun)

- Drop redundant dev_err() for platform_get_irq() errors (Krzysztof
  Wilczyński)

* remotes/lorenzo/pci/microchip:
  PCI: microchip: Remove dev_err() when handing an error from platform_get_irq()
  PCI: microchip: Make some symbols static
parents 0b51c08b 6e7628c8

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

+5 −7
Original line number Diff line number Diff line
@@ -301,27 +301,27 @@ static const struct cause event_cause[NUM_EVENTS] = { 
	LOCAL_EVENT_CAUSE(PM_MSI_INT_SYS_ERR, "system error"),

};



struct event_map pcie_event_to_event[] = {

static struct event_map pcie_event_to_event[] = {

	PCIE_EVENT_TO_EVENT_MAP(L2_EXIT),

	PCIE_EVENT_TO_EVENT_MAP(HOTRST_EXIT),

	PCIE_EVENT_TO_EVENT_MAP(DLUP_EXIT),

};



struct event_map sec_error_to_event[] = {

static struct event_map sec_error_to_event[] = {

	SEC_ERROR_TO_EVENT_MAP(TX_RAM_SEC_ERR),

	SEC_ERROR_TO_EVENT_MAP(RX_RAM_SEC_ERR),

	SEC_ERROR_TO_EVENT_MAP(PCIE2AXI_RAM_SEC_ERR),

	SEC_ERROR_TO_EVENT_MAP(AXI2PCIE_RAM_SEC_ERR),

};



struct event_map ded_error_to_event[] = {

static struct event_map ded_error_to_event[] = {

	DED_ERROR_TO_EVENT_MAP(TX_RAM_DED_ERR),

	DED_ERROR_TO_EVENT_MAP(RX_RAM_DED_ERR),

	DED_ERROR_TO_EVENT_MAP(PCIE2AXI_RAM_DED_ERR),

	DED_ERROR_TO_EVENT_MAP(AXI2PCIE_RAM_DED_ERR),

};



struct event_map local_status_to_event[] = {

static struct event_map local_status_to_event[] = {

	LOCAL_STATUS_TO_EVENT_MAP(DMA_END_ENGINE_0),

	LOCAL_STATUS_TO_EVENT_MAP(DMA_END_ENGINE_1),

	LOCAL_STATUS_TO_EVENT_MAP(DMA_ERROR_ENGINE_0),
@@ -1023,10 +1023,8 @@ static int mc_platform_init(struct pci_config_window *cfg) 
	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "unable to request IRQ%d\n", irq);

	if (irq < 0)

		return -ENODEV;

	}



	for (i = 0; i < NUM_EVENTS; i++) {

		event_irq = irq_create_mapping(port->event_domain, i);