From 23990425b56fd29f4142d309abfc9b33e16e94d7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Jun 2004 02:57:48 -0700 Subject: [PATCH] PCI: remove duplicate in pci_ids.h Get rid of duplicate entry, one is in the middle of the file with duplicate at the end Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman --- include/linux/pci_ids.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/linux') diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 45d805ddeb9e..31617253cdcb 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2272,6 +2272,3 @@ #define PCI_DEVICE_ID_MICROGATE_SCC 0x0020 #define PCI_DEVICE_ID_MICROGATE_SCA 0x0030 #define PCI_DEVICE_ID_MICROGATE_USC2 0x0210 - -#define PCI_VENDOR_ID_HINT 0x3388 -#define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013 -- cgit v1.2.3 From c911ba686e4496dc7ece5544d683e31db746aef0 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Jun 2004 02:58:27 -0700 Subject: [PATCH] PCI: fix out of order entry in pci_ids.h The last entry in pci_ids.h is out of order, someone wasn't reading the comment to keep it sorted. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman --- include/linux/pci_ids.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/linux') diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 31617253cdcb..80879404d80c 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1769,6 +1769,12 @@ #define PCI_DEVICE_ID_CCD_B00C 0xb00c #define PCI_DEVICE_ID_CCD_B100 0xb100 +#define PCI_VENDOR_ID_MICROGATE 0x13c0 +#define PCI_DEVICE_ID_MICROGATE_USC 0x0010 +#define PCI_DEVICE_ID_MICROGATE_SCC 0x0020 +#define PCI_DEVICE_ID_MICROGATE_SCA 0x0030 +#define PCI_DEVICE_ID_MICROGATE_USC2 0x0210 + #define PCI_VENDOR_ID_3WARE 0x13C1 #define PCI_DEVICE_ID_3WARE_1000 0x1000 #define PCI_DEVICE_ID_3WARE_7000 0x1001 @@ -2266,9 +2272,3 @@ #define PCI_DEVICE_ID_ARK_STING 0xa091 #define PCI_DEVICE_ID_ARK_STINGARK 0xa099 #define PCI_DEVICE_ID_ARK_2000MT 0xa0a1 - -#define PCI_VENDOR_ID_MICROGATE 0x13c0 -#define PCI_DEVICE_ID_MICROGATE_USC 0x0010 -#define PCI_DEVICE_ID_MICROGATE_SCC 0x0020 -#define PCI_DEVICE_ID_MICROGATE_SCA 0x0030 -#define PCI_DEVICE_ID_MICROGATE_USC2 0x0210 -- cgit v1.2.3 From b0316bada5735d62b854e471f1b1f501625e086f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Jun 2004 02:59:02 -0700 Subject: [PATCH] PCI: add id's for sk98 driver Redoing the sk98 driver to correct pci model. These are (most of) the entries it uses. Signed-off-by: Greg Kroah-Hartman --- include/linux/pci_ids.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/linux') diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 80879404d80c..e03556883a77 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -967,12 +967,14 @@ #define PCI_VENDOR_ID_3COM 0x10b7 #define PCI_DEVICE_ID_3COM_3C985 0x0001 +#define PCI_DEVICE_ID_3COM_3C940 0x1700 #define PCI_DEVICE_ID_3COM_3C339 0x3390 #define PCI_DEVICE_ID_3COM_3C359 0x3590 #define PCI_DEVICE_ID_3COM_3C590 0x5900 #define PCI_DEVICE_ID_3COM_3C595TX 0x5950 #define PCI_DEVICE_ID_3COM_3C595T4 0x5951 #define PCI_DEVICE_ID_3COM_3C595MII 0x5952 +#define PCI_DEVICE_ID_3COM_3C940B 0x80eb #define PCI_DEVICE_ID_3COM_3C900TPO 0x9000 #define PCI_DEVICE_ID_3COM_3C900COMBO 0x9001 #define PCI_DEVICE_ID_3COM_3C905TX 0x9050 @@ -1420,6 +1422,9 @@ #define PCI_DEVICE_ID_RICOH_RL5C476 0x0476 #define PCI_DEVICE_ID_RICOH_RL5C478 0x0478 +#define PCI_VENDOR_ID_DLINK 0x1186 +#define PCI_DEVICE_ID_DLINK_DGE510T 0x4c00 + #define PCI_VENDOR_ID_ARTOP 0x1191 #define PCI_DEVICE_ID_ARTOP_ATP8400 0x0004 #define PCI_DEVICE_ID_ARTOP_ATP850UF 0x0005 @@ -1735,6 +1740,9 @@ #define PCI_VENDOR_ID_KAWASAKI 0x136b #define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01 +#define PCI_VENDOR_ID_CNET 0x1371 +#define PCI_DEVICE_ID_CNET_GIGACARD 0x434e + #define PCI_VENDOR_ID_LMC 0x1376 #define PCI_DEVICE_ID_LMC_HSSI 0x0003 #define PCI_DEVICE_ID_LMC_DS3 0x0004 @@ -1919,6 +1927,10 @@ #define PCI_DEVICE_ID_FARSITE_TE1 0x1610 #define PCI_DEVICE_ID_FARSITE_TE1C 0x1612 +#define PCI_VENDOR_ID_LINKSYS 0x1737 +#define PCI_DEVICE_ID_LINKSYS_EG1032 0x1032 +#define PCI_DEVICE_ID_LINKSYS_EG1064 0x1064 + #define PCI_VENDOR_ID_ALTIMA 0x173b #define PCI_DEVICE_ID_ALTIMA_AC1000 0x03e8 #define PCI_DEVICE_ID_ALTIMA_AC1001 0x03e9 -- cgit v1.2.3 From a7993279fb7a54aa0beb4159bb1d1ea214372420 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 23 Jun 2004 21:57:36 -0700 Subject: Make bitops/cpumask functions be "const" where appropriate. --- arch/ppc64/kernel/bitops.c | 12 ++++++------ include/asm-ppc64/bitops.h | 6 +++--- include/asm-s390/byteorder.h | 6 +++--- include/linux/byteorder/swab.h | 6 +++--- include/linux/cpumask.h | 14 +++++++------- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'include/linux') diff --git a/arch/ppc64/kernel/bitops.c b/arch/ppc64/kernel/bitops.c index 941a3c9bc302..6b24b0219090 100644 --- a/arch/ppc64/kernel/bitops.c +++ b/arch/ppc64/kernel/bitops.c @@ -7,10 +7,10 @@ #include #include -unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size, +unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, unsigned long offset) { - unsigned long *p = addr + (offset >> 6); + const unsigned long *p = addr + (offset >> 6); unsigned long result = offset & ~63UL; unsigned long tmp; @@ -48,10 +48,10 @@ found_middle: EXPORT_SYMBOL(find_next_zero_bit); -unsigned long find_next_bit(unsigned long *addr, unsigned long size, +unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset) { - unsigned long *p = addr + (offset >> 6); + const unsigned long *p = addr + (offset >> 6); unsigned long result = offset & ~63UL; unsigned long tmp; @@ -106,10 +106,10 @@ static inline unsigned int ext2_ffz(unsigned int x) return rc; } -unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size, +unsigned long find_next_zero_le_bit(const unsigned long *addr, unsigned long size, unsigned long offset) { - unsigned int *p = ((unsigned int *)addr) + (offset >> 5); + const unsigned int *p = ((const unsigned int *)addr) + (offset >> 5); unsigned int result = offset & ~31; unsigned int tmp; diff --git a/include/asm-ppc64/bitops.h b/include/asm-ppc64/bitops.h index feeeb9b77b29..6d820e7ea772 100644 --- a/include/asm-ppc64/bitops.h +++ b/include/asm-ppc64/bitops.h @@ -288,15 +288,15 @@ static __inline__ int ffs(int x) #define hweight16(x) generic_hweight16(x) #define hweight8(x) generic_hweight8(x) -extern unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size, unsigned long offset); +extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, unsigned long offset); #define find_first_zero_bit(addr, size) \ find_next_zero_bit((addr), (size), 0) -extern unsigned long find_next_bit(unsigned long *addr, unsigned long size, unsigned long offset); +extern unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset); #define find_first_bit(addr, size) \ find_next_bit((addr), (size), 0) -extern unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size, unsigned long offset); +extern unsigned long find_next_zero_le_bit(const unsigned long *addr, unsigned long size, unsigned long offset); #define find_first_zero_le_bit(addr, size) \ find_next_zero_le_bit((addr), (size), 0) diff --git a/include/asm-s390/byteorder.h b/include/asm-s390/byteorder.h index 91a6f3893bcd..2cc35a0e188e 100644 --- a/include/asm-s390/byteorder.h +++ b/include/asm-s390/byteorder.h @@ -14,7 +14,7 @@ #ifdef __GNUC__ #ifdef __s390x__ -static __inline__ __u64 ___arch__swab64p(__u64 *x) +static __inline__ __u64 ___arch__swab64p(const __u64 *x) { __u64 result; @@ -40,7 +40,7 @@ static __inline__ void ___arch__swab64s(__u64 *x) } #endif /* __s390x__ */ -static __inline__ __u32 ___arch__swab32p(__u32 *x) +static __inline__ __u32 ___arch__swab32p(const __u32 *x) { __u32 result; @@ -77,7 +77,7 @@ static __inline__ void ___arch__swab32s(__u32 *x) *x = ___arch__swab32p(x); } -static __inline__ __u16 ___arch__swab16p(__u16 *x) +static __inline__ __u16 ___arch__swab16p(const __u16 *x) { __u16 result; diff --git a/include/linux/byteorder/swab.h b/include/linux/byteorder/swab.h index 02ad0b5246e9..2f1cb775125a 100644 --- a/include/linux/byteorder/swab.h +++ b/include/linux/byteorder/swab.h @@ -134,7 +134,7 @@ static __inline__ __attribute_const__ __u16 __fswab16(__u16 x) { return __arch__swab16(x); } -static __inline__ __u16 __swab16p(__u16 *x) +static __inline__ __u16 __swab16p(const __u16 *x) { return __arch__swab16p(x); } @@ -147,7 +147,7 @@ static __inline__ __attribute_const__ __u32 __fswab32(__u32 x) { return __arch__swab32(x); } -static __inline__ __u32 __swab32p(__u32 *x) +static __inline__ __u32 __swab32p(const __u32 *x) { return __arch__swab32p(x); } @@ -167,7 +167,7 @@ static __inline__ __attribute_const__ __u64 __fswab64(__u64 x) return __arch__swab64(x); # endif } -static __inline__ __u64 __swab64p(__u64 *x) +static __inline__ __u64 __swab64p(const __u64 *x) { return __arch__swab64p(x); } diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 1d06e38480f7..ecca23548b64 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -171,19 +171,19 @@ static inline int __cpus_subset(cpumask_t *src1p, } #define cpus_empty(src) __cpus_empty(&(src), NR_CPUS) -static inline int __cpus_empty(cpumask_t *srcp, int nbits) +static inline int __cpus_empty(const cpumask_t *srcp, int nbits) { return bitmap_empty(srcp->bits, nbits); } #define cpus_full(cpumask) __cpus_full(&(cpumask), NR_CPUS) -static inline int __cpus_full(cpumask_t *srcp, int nbits) +static inline int __cpus_full(const cpumask_t *srcp, int nbits) { return bitmap_full(srcp->bits, nbits); } #define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS) -static inline int __cpus_weight(cpumask_t *srcp, int nbits) +static inline int __cpus_weight(const cpumask_t *srcp, int nbits) { return bitmap_weight(srcp->bits, nbits); } @@ -191,7 +191,7 @@ static inline int __cpus_weight(cpumask_t *srcp, int nbits) #define cpus_shift_right(dst, src, n) \ __cpus_shift_right(&(dst), &(src), (n), NR_CPUS) static inline void __cpus_shift_right(cpumask_t *dstp, - cpumask_t *srcp, int n, int nbits) + const cpumask_t *srcp, int n, int nbits) { bitmap_shift_right(dstp->bits, srcp->bits, n, nbits); } @@ -199,19 +199,19 @@ static inline void __cpus_shift_right(cpumask_t *dstp, #define cpus_shift_left(dst, src, n) \ __cpus_shift_left(&(dst), &(src), (n), NR_CPUS) static inline void __cpus_shift_left(cpumask_t *dstp, - cpumask_t *srcp, int n, int nbits) + const cpumask_t *srcp, int n, int nbits) { bitmap_shift_left(dstp->bits, srcp->bits, n, nbits); } #define first_cpu(src) __first_cpu(&(src), NR_CPUS) -static inline int __first_cpu(cpumask_t *srcp, int nbits) +static inline int __first_cpu(const cpumask_t *srcp, int nbits) { return find_first_bit(srcp->bits, nbits); } #define next_cpu(n, src) __next_cpu((n), &(src), NR_CPUS) -static inline int __next_cpu(int n, cpumask_t *srcp, int nbits) +static inline int __next_cpu(int n, const cpumask_t *srcp, int nbits) { return find_next_bit(srcp->bits, nbits, n+1); } -- cgit v1.2.3