Skip to content

Commit 180594f

Browse files
committed
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
2 parents 0b51c08 + 6e7628c commit 180594f

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -301,27 +301,27 @@ static const struct cause event_cause[NUM_EVENTS] = {
301301
LOCAL_EVENT_CAUSE(PM_MSI_INT_SYS_ERR, "system error"),
302302
};
303303

304-
struct event_map pcie_event_to_event[] = {
304+
static struct event_map pcie_event_to_event[] = {
305305
PCIE_EVENT_TO_EVENT_MAP(L2_EXIT),
306306
PCIE_EVENT_TO_EVENT_MAP(HOTRST_EXIT),
307307
PCIE_EVENT_TO_EVENT_MAP(DLUP_EXIT),
308308
};
309309

310-
struct event_map sec_error_to_event[] = {
310+
static struct event_map sec_error_to_event[] = {
311311
SEC_ERROR_TO_EVENT_MAP(TX_RAM_SEC_ERR),
312312
SEC_ERROR_TO_EVENT_MAP(RX_RAM_SEC_ERR),
313313
SEC_ERROR_TO_EVENT_MAP(PCIE2AXI_RAM_SEC_ERR),
314314
SEC_ERROR_TO_EVENT_MAP(AXI2PCIE_RAM_SEC_ERR),
315315
};
316316

317-
struct event_map ded_error_to_event[] = {
317+
static struct event_map ded_error_to_event[] = {
318318
DED_ERROR_TO_EVENT_MAP(TX_RAM_DED_ERR),
319319
DED_ERROR_TO_EVENT_MAP(RX_RAM_DED_ERR),
320320
DED_ERROR_TO_EVENT_MAP(PCIE2AXI_RAM_DED_ERR),
321321
DED_ERROR_TO_EVENT_MAP(AXI2PCIE_RAM_DED_ERR),
322322
};
323323

324-
struct event_map local_status_to_event[] = {
324+
static struct event_map local_status_to_event[] = {
325325
LOCAL_STATUS_TO_EVENT_MAP(DMA_END_ENGINE_0),
326326
LOCAL_STATUS_TO_EVENT_MAP(DMA_END_ENGINE_1),
327327
LOCAL_STATUS_TO_EVENT_MAP(DMA_ERROR_ENGINE_0),
@@ -1023,10 +1023,8 @@ static int mc_platform_init(struct pci_config_window *cfg)
10231023
}
10241024

10251025
irq = platform_get_irq(pdev, 0);
1026-
if (irq < 0) {
1027-
dev_err(dev, "unable to request IRQ%d\n", irq);
1026+
if (irq < 0)
10281027
return -ENODEV;
1029-
}
10301028

10311029
for (i = 0; i < NUM_EVENTS; i++) {
10321030
event_irq = irq_create_mapping(port->event_domain, i);

0 commit comments

Comments
 (0)