[SCSI] replace __inline with inline (1beb6fa8) · Commits · 戴 / test

drivers/scsi/aic7xxx/aic79xx_core.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1034,7 +1034,7 @@ ahd_intr(struct ahd_softc *ahd)
	}		}

	/****************************** Private Inlines ***************************/		/****************************** Private Inlines ***************************/
	static __inline void		static inline void
	ahd_assert_atn(struct ahd_softc *ahd)		ahd_assert_atn(struct ahd_softc *ahd)
	{		{
	ahd_outb(ahd, SCSISIGO, ATNO);		ahd_outb(ahd, SCSISIGO, ATNO);
	@@ -1069,7 +1069,7 @@ ahd_currently_packetized(struct ahd_softc *ahd)
	return (packetized);		return (packetized);
	}		}

	static __inline int		static inline int
	ahd_set_active_fifo(struct ahd_softc *ahd)		ahd_set_active_fifo(struct ahd_softc *ahd)
	{		{
	u_int active_fifo;		u_int active_fifo;
	@@ -1086,7 +1086,7 @@ ahd_set_active_fifo(struct ahd_softc *ahd)
	}		}
	}		}

	static __inline void		static inline void
	ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl)		ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl)
	{		{
	ahd_busy_tcl(ahd, tcl, SCB_LIST_NULL);		ahd_busy_tcl(ahd, tcl, SCB_LIST_NULL);
	@@ -1096,7 +1096,7 @@ ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl)
	* Determine whether the sequencer reported a residual		* Determine whether the sequencer reported a residual
	* for this SCB/transaction.		* for this SCB/transaction.
	*/		*/
	static __inline void		static inline void
	ahd_update_residual(struct ahd_softc ahd, struct scb scb)		ahd_update_residual(struct ahd_softc ahd, struct scb scb)
	{		{
	uint32_t sgptr;		uint32_t sgptr;
	@@ -1106,7 +1106,7 @@ ahd_update_residual(struct ahd_softc ahd, struct scb scb)
	ahd_calc_residual(ahd, scb);		ahd_calc_residual(ahd, scb);
	}		}

	static __inline void		static inline void
	ahd_complete_scb(struct ahd_softc ahd, struct scb scb)		ahd_complete_scb(struct ahd_softc ahd, struct scb scb)
	{		{
	uint32_t sgptr;		uint32_t sgptr;
	@@ -7987,7 +7987,7 @@ ahd_resume(struct ahd_softc *ahd)
	* scbid that should be restored once manipualtion		* scbid that should be restored once manipualtion
	* of the TCL entry is complete.		* of the TCL entry is complete.
	*/		*/
	static __inline u_int		static inline u_int
	ahd_index_busy_tcl(struct ahd_softc ahd, u_int saved_scbid, u_int tcl)		ahd_index_busy_tcl(struct ahd_softc ahd, u_int saved_scbid, u_int tcl)
	{		{
	/*		/*

drivers/scsi/aic7xxx/aic79xx_inline.h

+14 −18

Original line number	Original line	Diff line number	Diff line
	@@ -46,21 +46,20 @@
	#define _AIC79XX_INLINE_H_		#define _AIC79XX_INLINE_H_

	/****************************** Debugging *********************************/		/****************************** Debugging *********************************/
	static __inline char ahd_name(struct ahd_softc ahd);		static inline char ahd_name(struct ahd_softc ahd);

	static __inline char *		static inline char ahd_name(struct ahd_softc ahd)
	ahd_name(struct ahd_softc *ahd)
	{		{
	return (ahd->name);		return (ahd->name);
	}		}

	/********************** Sequencer Execution Control ***********************/		/********************** Sequencer Execution Control ***********************/
	static __inline void ahd_known_modes(struct ahd_softc *ahd,		static inline void ahd_known_modes(struct ahd_softc *ahd,
	ahd_mode src, ahd_mode dst);		ahd_mode src, ahd_mode dst);
	static __inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd,		static inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd,
	ahd_mode src,		ahd_mode src,
	ahd_mode dst);		ahd_mode dst);
	static __inline void ahd_extract_mode_state(struct ahd_softc *ahd,		static inline void ahd_extract_mode_state(struct ahd_softc *ahd,
	ahd_mode_state state,		ahd_mode_state state,
	ahd_mode src, ahd_mode dst);		ahd_mode src, ahd_mode dst);

	@@ -73,7 +72,7 @@ int ahd_is_paused(struct ahd_softc *ahd);
	void ahd_pause(struct ahd_softc *ahd);		void ahd_pause(struct ahd_softc *ahd);
	void ahd_unpause(struct ahd_softc *ahd);		void ahd_unpause(struct ahd_softc *ahd);

	static __inline void		static inline void
	ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)		ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
	{		{
	ahd->src_mode = src;		ahd->src_mode = src;
	@@ -82,13 +81,13 @@ ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
	ahd->saved_dst_mode = dst;		ahd->saved_dst_mode = dst;
	}		}

	static __inline ahd_mode_state		static inline ahd_mode_state
	ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)		ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
	{		{
	return ((src << SRC_MODE_SHIFT) \| (dst << DST_MODE_SHIFT));		return ((src << SRC_MODE_SHIFT) \| (dst << DST_MODE_SHIFT));
	}		}

	static __inline void		static inline void
	ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state,		ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state,
	ahd_mode src, ahd_mode dst)		ahd_mode src, ahd_mode dst)
	{		{
	@@ -102,13 +101,12 @@ void ahd_sg_setup(struct ahd_softc ahd, struct scb *scb,
	bus_size_t len, int last);		bus_size_t len, int last);

	/************************ Memory mapping routines *************************/		/************************ Memory mapping routines *************************/
	static __inline size_t ahd_sg_size(struct ahd_softc *ahd);		static inline size_t ahd_sg_size(struct ahd_softc *ahd);

	void ahd_sync_sglist(struct ahd_softc *ahd,		void ahd_sync_sglist(struct ahd_softc *ahd,
	struct scb *scb, int op);		struct scb *scb, int op);

	static __inline size_t		static inline size_t ahd_sg_size(struct ahd_softc *ahd)
	ahd_sg_size(struct ahd_softc *ahd)
	{		{
	if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0)		if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0)
	return (sizeof(struct ahd_dma64_seg));		return (sizeof(struct ahd_dma64_seg));
	@@ -141,11 +139,9 @@ struct scb *
	ahd_lookup_scb(struct ahd_softc *ahd, u_int tag);		ahd_lookup_scb(struct ahd_softc *ahd, u_int tag);
	void ahd_queue_scb(struct ahd_softc ahd, struct scb scb);		void ahd_queue_scb(struct ahd_softc ahd, struct scb scb);

	static __inline uint8_t *		static inline uint8_t ahd_get_sense_buf(struct ahd_softc ahd,
	ahd_get_sense_buf(struct ahd_softc *ahd,
	struct scb *scb);		struct scb *scb);
	static __inline uint32_t		static inline uint32_t ahd_get_sense_bufaddr(struct ahd_softc *ahd,
	ahd_get_sense_bufaddr(struct ahd_softc *ahd,
	struct scb *scb);		struct scb *scb);

	#if 0 /* unused */		#if 0 /* unused */
	@@ -158,13 +154,13 @@ do { \

	#endif		#endif

	static __inline uint8_t *		static inline uint8_t *
	ahd_get_sense_buf(struct ahd_softc ahd, struct scb scb)		ahd_get_sense_buf(struct ahd_softc ahd, struct scb scb)
	{		{
	return (scb->sense_data);		return (scb->sense_data);
	}		}

	static __inline uint32_t		static inline uint32_t
	ahd_get_sense_bufaddr(struct ahd_softc ahd, struct scb scb)		ahd_get_sense_bufaddr(struct ahd_softc ahd, struct scb scb)
	{		{
	return (scb->sense_busaddr);		return (scb->sense_busaddr);

drivers/scsi/aic7xxx/aic79xx_osm.h

+51 −51

drivers/scsi/aic7xxx/aic79xx_pci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@

	#include "aic79xx_pci.h"		#include "aic79xx_pci.h"

	static __inline uint64_t		static inline uint64_t
	ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)		ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
	{		{
	uint64_t id;		uint64_t id;

drivers/scsi/aic7xxx/aic7xxx_inline.h

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -55,10 +55,9 @@ void ahc_sync_sglist(struct ahc_softc *ahc,
	struct scb *scb, int op);		struct scb *scb, int op);

	/****************************** Debugging *********************************/		/****************************** Debugging *********************************/
	static __inline char ahc_name(struct ahc_softc ahc);		static inline char ahc_name(struct ahc_softc ahc);

	static __inline char *		static inline char ahc_name(struct ahc_softc ahc)
	ahc_name(struct ahc_softc *ahc)
	{		{
	return (ahc->name);		return (ahc->name);
	}		}

Admin message