Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/netdev-jwl (1f8fc993) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/sk98lin/h/skdrv2nd.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ extern SK_U64 SkOsGetTime(SK_AC*);
		extern int SkPciReadCfgDWord(SK_AC, int, SK_U32);
		extern int SkPciReadCfgWord(SK_AC, int, SK_U16);
		extern int SkPciReadCfgByte(SK_AC, int, SK_U8);
		extern int SkPciWriteCfgDWord(SK_AC*, int, SK_U32);
		extern int SkPciWriteCfgWord(SK_AC*, int, SK_U16);
		extern int SkPciWriteCfgByte(SK_AC*, int, SK_U8);
		extern int SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA);

drivers/net/sk98lin/h/skvpd.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -130,14 +130,12 @@ typedef struct s_vpd_key {
		#ifndef VPD_DO_IO
		#define VPD_OUT8(pAC,IoC,Addr,Val) (void)SkPciWriteCfgByte(pAC,Addr,Val)
		#define VPD_OUT16(pAC,IoC,Addr,Val) (void)SkPciWriteCfgWord(pAC,Addr,Val)
		#define VPD_OUT32(pAC,IoC,Addr,Val) (void)SkPciWriteCfgDWord(pAC,Addr,Val)
		#define VPD_IN8(pAC,IoC,Addr,pVal) (void)SkPciReadCfgByte(pAC,Addr,pVal)
		#define VPD_IN16(pAC,IoC,Addr,pVal) (void)SkPciReadCfgWord(pAC,Addr,pVal)
		#define VPD_IN32(pAC,IoC,Addr,pVal) (void)SkPciReadCfgDWord(pAC,Addr,pVal)
		#else /* VPD_DO_IO */
		#define VPD_OUT8(pAC,IoC,Addr,Val) SK_OUT8(IoC,PCI_C(Addr),Val)
		#define VPD_OUT16(pAC,IoC,Addr,Val) SK_OUT16(IoC,PCI_C(Addr),Val)
		#define VPD_OUT32(pAC,IoC,Addr,Val) SK_OUT32(IoC,PCI_C(Addr),Val)
		#define VPD_IN8(pAC,IoC,Addr,pVal) SK_IN8(IoC,PCI_C(Addr),pVal)
		#define VPD_IN16(pAC,IoC,Addr,pVal) SK_IN16(IoC,PCI_C(Addr),pVal)
		#define VPD_IN32(pAC,IoC,Addr,pVal) SK_IN32(IoC,PCI_C(Addr),pVal)
		@@ -155,12 +153,6 @@ typedef struct s_vpd_key {
		else \
		SK_OUT16(pAC,PCI_C(Addr),Val); \
		}
		#define VPD_OUT32(pAC,Ioc,Addr,Val) { \
		if ((pAC)->DgT.DgUseCfgCycle) \
		SkPciWriteCfgDWord(pAC,Addr,Val); \
		else \
		SK_OUT32(pAC,PCI_C(Addr),Val); \
		}
		#define VPD_IN8(pAC,Ioc,Addr,pVal) { \
		if ((pAC)->DgT.DgUseCfgCycle) \
		SkPciReadCfgByte(pAC,Addr,pVal); \

drivers/net/sk98lin/skge.c

+21 −22

Original line number	Diff line number	Diff line
		@@ -277,6 +277,27 @@ extern struct ethtool_ops SkGeEthtoolOps;
		static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
		static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};

		/*****************************************************************************
		*
		* SkPciWriteCfgDWord - write a 32 bit value to pci config space
		*
		* Description:
		* This routine writes a 32 bit value to the pci configuration
		* space.
		*
		* Returns:
		* 0 - indicate everything worked ok.
		* != 0 - error indication
		*/
		static inline int SkPciWriteCfgDWord(
		SK_AC pAC, / Adapter Control structure pointer */
		int PciAddr, /* PCI register address */
		SK_U32 Val) /* pointer to store the read value */
		{
		pci_write_config_dword(pAC->PciDev, PciAddr, Val);
		return(0);
		} /* SkPciWriteCfgDWord */

		/*****************************************************************************
		*
		* SkGeInitPCI - Init the PCI resources
		@@ -4083,28 +4104,6 @@ SK_U8 pVal) / pointer to store the read value */
		} /* SkPciReadCfgByte */


		/*****************************************************************************
		*
		* SkPciWriteCfgDWord - write a 32 bit value to pci config space
		*
		* Description:
		* This routine writes a 32 bit value to the pci configuration
		* space.
		*
		* Returns:
		* 0 - indicate everything worked ok.
		* != 0 - error indication
		*/
		int SkPciWriteCfgDWord(
		SK_AC pAC, / Adapter Control structure pointer */
		int PciAddr, /* PCI register address */
		SK_U32 Val) /* pointer to store the read value */
		{
		pci_write_config_dword(pAC->PciDev, PciAddr, Val);
		return(0);
		} /* SkPciWriteCfgDWord */


		/*****************************************************************************
		*
		* SkPciWriteCfgWord - write a 16 bit value to pci config space

drivers/net/wan/lmc/lmc_prot.h

deleted100644 → 0

+0 −15

Original line number	Diff line number	Diff line
		#ifndef _LMC_PROTO_H_
		#define _LMC_PROTO_H_

		void lmc_proto_init(lmc_softc_t * const)
		void lmc_proto_attach(lmc_softc_t *sc const)
		void lmc_proto_detach(lmc_softc *sc const)
		void lmc_proto_reopen(lmc_softc_t *sc const)
		int lmc_proto_ioctl(lmc_softc_t sc const, struct ifreq ifr, int cmd)
		void lmc_proto_open(lmc_softc_t *sc const)
		void lmc_proto_close(lmc_softc_t *sc const)
		unsigned short lmc_proto_type(lmc_softc_t sc const, struct skbuff skb)


		#endif

drivers/net/wireless/atmel.c

+762 −728

File changed.

Preview size limit exceeded, changes collapsed.