Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e783865 authored by Gabor Juhos's avatar Gabor Juhos Committed by John Crispin
Browse files

MIPS: ath79: remove unused ar7{1x,24}x_pcibios_init functions 



The functions are unused now, so remove them.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4909/


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 9fc1ca5b

arch/mips/ath79/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/mach-ath79/ar71xx_regs.h>

#include <asm/mach-ath79/ath79.h>

#include <asm/mach-ath79/irq.h>

#include <asm/mach-ath79/pci.h>

#include "pci.h"



static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);

arch/mips/include/asm/mach-ath79/pci.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 *  Atheros AR71XX/AR724X PCI support

 *

 *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>

 *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>

 *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>

 *

 *  This program is free software; you can redistribute it and/or modify it

 *  under the terms of the GNU General Public License version 2 as published

 *  by the Free Software Foundation.

 */



#ifndef __ASM_MACH_ATH79_PCI_H

#define __ASM_MACH_ATH79_PCI_H



#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR71XX)

int ar71xx_pcibios_init(void);

#else

static inline int ar71xx_pcibios_init(void) { return 0; }

#endif



#if defined(CONFIG_PCI_AR724X)

int ar724x_pcibios_init(int irq);

#else

static inline int ar724x_pcibios_init(int irq) { return 0; }

#endif



#endif /* __ASM_MACH_ATH79_PCI_H */

arch/mips/pci/pci-ar71xx.c

+0 −26
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include <asm/mach-ath79/ar71xx_regs.h>

#include <asm/mach-ath79/ath79.h>

#include <asm/mach-ath79/pci.h>



#define AR71XX_PCI_REG_CRP_AD_CBE	0x00

#define AR71XX_PCI_REG_CRP_WRDATA	0x04
@@ -335,31 +334,6 @@ static void ar71xx_pci_reset(void) 
	mdelay(100);

}



__init int ar71xx_pcibios_init(void)

{

	u32 t;



	ar71xx_pcicfg_base = ioremap(AR71XX_PCI_CFG_BASE, AR71XX_PCI_CFG_SIZE);

	if (ar71xx_pcicfg_base == NULL)

		return -ENOMEM;



	ar71xx_pci_reset();



	/* setup COMMAND register */

	t = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE

	  | PCI_COMMAND_PARITY | PCI_COMMAND_SERR | PCI_COMMAND_FAST_BACK;

	ar71xx_pci_local_write(PCI_COMMAND, 4, t);



	/* clear bus errors */

	ar71xx_pci_check_error(1);



	ar71xx_pci_irq_init(ATH79_CPU_IRQ_IP2);



	register_pci_controller(&ar71xx_pci_controller);



	return 0;

}



static int ar71xx_pci_probe(struct platform_device *pdev)

{

	struct resource *res;

arch/mips/pci/pci-ar724x.c

+0 −32
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/platform_device.h>

#include <asm/mach-ath79/ath79.h>

#include <asm/mach-ath79/ar71xx_regs.h>

#include <asm/mach-ath79/pci.h>



#define AR724X_PCI_REG_RESET		0x18

#define AR724X_PCI_REG_INT_STATUS	0x4c
@@ -276,37 +275,6 @@ static void ar724x_pci_irq_init(int irq) 
	irq_set_chained_handler(irq, ar724x_pci_irq_handler);

}



int ar724x_pcibios_init(int irq)

{

	int ret;



	ret = -ENOMEM;



	ar724x_pci_devcfg_base = ioremap(AR724X_PCI_CFG_BASE,

					 AR724X_PCI_CFG_SIZE);

	if (ar724x_pci_devcfg_base == NULL)

		goto err;



	ar724x_pci_ctrl_base = ioremap(AR724X_PCI_CTRL_BASE,

				       AR724X_PCI_CTRL_SIZE);

	if (ar724x_pci_ctrl_base == NULL)

		goto err_unmap_devcfg;



	ar724x_pci_link_up = ar724x_pci_check_link();

	if (!ar724x_pci_link_up)

		pr_warn("ar724x: PCIe link is down\n");



	ar724x_pci_irq_init(irq);

	register_pci_controller(&ar724x_pci_controller);



	return PCIBIOS_SUCCESSFUL;



err_unmap_devcfg:

	iounmap(ar724x_pci_devcfg_base);

err:

	return ret;

}



static int ar724x_pci_probe(struct platform_device *pdev)

{

	struct resource *res;