aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic7xxx/aic79xx_inline.h
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2009-03-04 15:06:06 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-04-03 11:23:16 -0400
commit1beb6fa85ca9afaee109811a3f4a984232a32a4f (patch)
tree432ecd3c15c451e4f3027811f7ab6fed8bd99f5c /drivers/scsi/aic7xxx/aic79xx_inline.h
parent5880f486ef733dae820724a71e3b91241c7921bd (diff)
[SCSI] replace __inline with inline
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Jeff Garzik <jgarzik@redhat.com> Acked-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_inline.h')
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_inline.h32
1 files changed, 14 insertions, 18 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_inline.h b/drivers/scsi/aic7xxx/aic79xx_inline.h
index 5f12cf9d99d0..09335a3c8691 100644
--- a/drivers/scsi/aic7xxx/aic79xx_inline.h
+++ b/drivers/scsi/aic7xxx/aic79xx_inline.h
@@ -46,21 +46,20 @@
46#define _AIC79XX_INLINE_H_ 46#define _AIC79XX_INLINE_H_
47 47
48/******************************** Debugging ***********************************/ 48/******************************** Debugging ***********************************/
49static __inline char *ahd_name(struct ahd_softc *ahd); 49static inline char *ahd_name(struct ahd_softc *ahd);
50 50
51static __inline char * 51static inline char *ahd_name(struct ahd_softc *ahd)
52ahd_name(struct ahd_softc *ahd)
53{ 52{
54 return (ahd->name); 53 return (ahd->name);
55} 54}
56 55
57/************************ Sequencer Execution Control *************************/ 56/************************ Sequencer Execution Control *************************/
58static __inline void ahd_known_modes(struct ahd_softc *ahd, 57static inline void ahd_known_modes(struct ahd_softc *ahd,
59 ahd_mode src, ahd_mode dst); 58 ahd_mode src, ahd_mode dst);
60static __inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd, 59static inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd,
61 ahd_mode src, 60 ahd_mode src,
62 ahd_mode dst); 61 ahd_mode dst);
63static __inline void ahd_extract_mode_state(struct ahd_softc *ahd, 62static inline void ahd_extract_mode_state(struct ahd_softc *ahd,
64 ahd_mode_state state, 63 ahd_mode_state state,
65 ahd_mode *src, ahd_mode *dst); 64 ahd_mode *src, ahd_mode *dst);
66 65
@@ -73,7 +72,7 @@ int ahd_is_paused(struct ahd_softc *ahd);
73void ahd_pause(struct ahd_softc *ahd); 72void ahd_pause(struct ahd_softc *ahd);
74void ahd_unpause(struct ahd_softc *ahd); 73void ahd_unpause(struct ahd_softc *ahd);
75 74
76static __inline void 75static inline void
77ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst) 76ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
78{ 77{
79 ahd->src_mode = src; 78 ahd->src_mode = src;
@@ -82,13 +81,13 @@ ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
82 ahd->saved_dst_mode = dst; 81 ahd->saved_dst_mode = dst;
83} 82}
84 83
85static __inline ahd_mode_state 84static inline ahd_mode_state
86ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst) 85ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
87{ 86{
88 return ((src << SRC_MODE_SHIFT) | (dst << DST_MODE_SHIFT)); 87 return ((src << SRC_MODE_SHIFT) | (dst << DST_MODE_SHIFT));
89} 88}
90 89
91static __inline void 90static inline void
92ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state, 91ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state,
93 ahd_mode *src, ahd_mode *dst) 92 ahd_mode *src, ahd_mode *dst)
94{ 93{
@@ -102,13 +101,12 @@ void *ahd_sg_setup(struct ahd_softc *ahd, struct scb *scb,
102 bus_size_t len, int last); 101 bus_size_t len, int last);
103 102
104/************************** Memory mapping routines ***************************/ 103/************************** Memory mapping routines ***************************/
105static __inline size_t ahd_sg_size(struct ahd_softc *ahd); 104static inline size_t ahd_sg_size(struct ahd_softc *ahd);
106 105
107void ahd_sync_sglist(struct ahd_softc *ahd, 106void ahd_sync_sglist(struct ahd_softc *ahd,
108 struct scb *scb, int op); 107 struct scb *scb, int op);
109 108
110static __inline size_t 109static inline size_t ahd_sg_size(struct ahd_softc *ahd)
111ahd_sg_size(struct ahd_softc *ahd)
112{ 110{
113 if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0) 111 if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0)
114 return (sizeof(struct ahd_dma64_seg)); 112 return (sizeof(struct ahd_dma64_seg));
@@ -141,11 +139,9 @@ struct scb *
141 ahd_lookup_scb(struct ahd_softc *ahd, u_int tag); 139 ahd_lookup_scb(struct ahd_softc *ahd, u_int tag);
142void ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb); 140void ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb);
143 141
144static __inline uint8_t * 142static inline uint8_t *ahd_get_sense_buf(struct ahd_softc *ahd,
145 ahd_get_sense_buf(struct ahd_softc *ahd,
146 struct scb *scb); 143 struct scb *scb);
147static __inline uint32_t 144static inline uint32_t ahd_get_sense_bufaddr(struct ahd_softc *ahd,
148 ahd_get_sense_bufaddr(struct ahd_softc *ahd,
149 struct scb *scb); 145 struct scb *scb);
150 146
151#if 0 /* unused */ 147#if 0 /* unused */
@@ -158,13 +154,13 @@ do { \
158 154
159#endif 155#endif
160 156
161static __inline uint8_t * 157static inline uint8_t *
162ahd_get_sense_buf(struct ahd_softc *ahd, struct scb *scb) 158ahd_get_sense_buf(struct ahd_softc *ahd, struct scb *scb)
163{ 159{
164 return (scb->sense_data); 160 return (scb->sense_data);
165} 161}
166 162
167static __inline uint32_t 163static inline uint32_t
168ahd_get_sense_bufaddr(struct ahd_softc *ahd, struct scb *scb) 164ahd_get_sense_bufaddr(struct ahd_softc *ahd, struct scb *scb)
169{ 165{
170 return (scb->sense_busaddr); 166 return (scb->sense_busaddr);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-20 05:26:17 -0500