Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 11 Mar 2020 15:12:32 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r358890 - in head/sys/cam: . scsi
Message-ID:  <202003111512.02BFCWGR010049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: imp
Date: Wed Mar 11 15:12:31 2020
New Revision: 358890
URL: https://svnweb.freebsd.org/changeset/base/358890

Log:
  Remove redundantly repetitive static __inline forward function
  declarations.
  
  We typically don't use them elsewhere in the kernel, and they aren't
  needed here: the actual functions are a few lines away and aren't
  mutually recursive.

Modified:
  head/sys/cam/cam.h
  head/sys/cam/cam_sim.h
  head/sys/cam/cam_xpt.c
  head/sys/cam/scsi/scsi_all.h

Modified: head/sys/cam/cam.h
==============================================================================
--- head/sys/cam/cam.h	Wed Mar 11 13:51:01 2020	(r358889)
+++ head/sys/cam/cam.h	Wed Mar 11 15:12:31 2020	(r358890)
@@ -403,11 +403,9 @@ void	cam_error_print(struct cam_device *device, union 
 __END_DECLS
 
 #ifdef _KERNEL
-static __inline void cam_init_pinfo(cam_pinfo *pinfo);
-
 static __inline void cam_init_pinfo(cam_pinfo *pinfo)
 {
-	pinfo->priority = CAM_PRIORITY_NONE;	
+	pinfo->priority = CAM_PRIORITY_NONE;
 	pinfo->index = CAM_UNQUEUED_INDEX;
 }
 #endif

Modified: head/sys/cam/cam_sim.h
==============================================================================
--- head/sys/cam/cam_sim.h	Wed Mar 11 13:51:01 2020	(r358889)
+++ head/sys/cam/cam_sim.h	Wed Mar 11 15:12:31 2020	(r358890)
@@ -79,16 +79,6 @@ void		  cam_sim_release(struct cam_sim *sim);
 void	cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id);
 
 
-
-/* Convenience routines for accessing sim attributes. */
-static __inline u_int32_t    cam_sim_path(const struct cam_sim *sim);
-static __inline const char * cam_sim_name(const struct cam_sim *sim);
-static __inline void *	     cam_sim_softc(const struct cam_sim *sim);
-static __inline u_int32_t    cam_sim_unit(const struct cam_sim *sim);
-static __inline u_int32_t    cam_sim_bus(const struct cam_sim *sim);
-
-
-
 /* Generically useful offsets into the sim private area */
 #define spriv_ptr0 sim_priv.entries[0].ptr
 #define spriv_ptr1 sim_priv.entries[1].ptr

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Wed Mar 11 13:51:01 2020	(r358889)
+++ head/sys/cam/cam_xpt.c	Wed Mar 11 15:12:31 2020	(r358890)
@@ -323,7 +323,6 @@ static xpt_devicefunc_t	xptsetasyncfunc;
 static xpt_busfunc_t	xptsetasyncbusfunc;
 static cam_status	xptregister(struct cam_periph *periph,
 				    void *arg);
-static __inline int device_is_queued(struct cam_ed *device);
 
 static __inline int
 xpt_schedule_devq(struct cam_devq *devq, struct cam_ed *dev)

Modified: head/sys/cam/scsi/scsi_all.h
==============================================================================
--- head/sys/cam/scsi/scsi_all.h	Wed Mar 11 13:51:01 2020	(r358889)
+++ head/sys/cam/scsi/scsi_all.h	Wed Mar 11 15:12:31 2020	(r358890)
@@ -4324,17 +4324,6 @@ int scsi_get_asc(struct scsi_sense_data *sense, u_int 
 		 int show_errors);
 int scsi_get_ascq(struct scsi_sense_data *sense, u_int sense_len,
 		  int show_errors);
-static __inline void scsi_ulto2b(u_int32_t val, u_int8_t *bytes);
-static __inline void scsi_ulto3b(u_int32_t val, u_int8_t *bytes);
-static __inline void scsi_ulto4b(u_int32_t val, u_int8_t *bytes);
-static __inline void scsi_u64to8b(u_int64_t val, u_int8_t *bytes);
-static __inline uint32_t scsi_2btoul(const uint8_t *bytes);
-static __inline uint32_t scsi_3btoul(const uint8_t *bytes);
-static __inline int32_t scsi_3btol(const uint8_t *bytes);
-static __inline uint32_t scsi_4btoul(const uint8_t *bytes);
-static __inline uint64_t scsi_8btou64(const uint8_t *bytes);
-static __inline void *find_mode_page_6(struct scsi_mode_header_6 *mode_header);
-static __inline void *find_mode_page_10(struct scsi_mode_header_10 *mode_header);
 
 static __inline void
 scsi_ulto2b(u_int32_t val, u_int8_t *bytes)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003111512.02BFCWGR010049>