svn commit: r336268 - head/sys/dev/smartpqi

[Conrad Meyer]

Author: cem
Date: Fri Jul 13 22:49:48 2018
New Revision: 336268
URL: https://svnweb.freebsd.org/changeset/base/336268

Log:
  Re-unbreak smartpqi(4) GCC build
  
  Like r333085, remove redundant declarations.
  
  Redundant declarations were re-introduced in r336201.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/dev/smartpqi/smartpqi_cam.c
  head/sys/dev/smartpqi/smartpqi_ioctl.c
  head/sys/dev/smartpqi/smartpqi_main.c
  head/sys/dev/smartpqi/smartpqi_prototypes.h

Modified: head/sys/dev/smartpqi/smartpqi_cam.c
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_cam.c	Fri Jul 13 22:40:14 2018	(r336267)
+++ head/sys/dev/smartpqi/smartpqi_cam.c	Fri Jul 13 22:49:48 2018	(r336268)
@@ -1198,7 +1198,3 @@ void deregister_sim(struct pqisrc_softstate *softs)
 
 	DBG_FUNC("OUT\n");
 }
-
-static void smartpqi_cam_action(struct cam_sim *, union ccb *);
-static void smartpqi_poll(struct cam_sim *);
-

Modified: head/sys/dev/smartpqi/smartpqi_ioctl.c
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_ioctl.c	Fri Jul 13 22:40:14 2018	(r336267)
+++ head/sys/dev/smartpqi/smartpqi_ioctl.c	Fri Jul 13 22:49:48 2018	(r336268)
@@ -166,10 +166,6 @@ static int smartpqi_ioctl(struct cdev *cdev, u_long cm
 	return error;
 }
 
-static d_open_t         smartpqi_open;
-static d_ioctl_t        smartpqi_ioctl;
-static d_close_t        smartpqi_close;
-
 static struct cdevsw smartpqi_cdevsw =
 {
 	.d_version = D_VERSION,

Modified: head/sys/dev/smartpqi/smartpqi_main.c
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_main.c	Fri Jul 13 22:40:14 2018	(r336267)
+++ head/sys/dev/smartpqi/smartpqi_main.c	Fri Jul 13 22:49:48 2018	(r336268)
@@ -482,12 +482,6 @@ smartpqi_shutdown(void *arg)
 	return rval;
 }
 
-static int      smartpqi_probe(device_t dev);
-static int      smartpqi_attach(device_t dev);
-static int      smartpqi_detach(device_t dev);
-static int      smartpqi_suspend(device_t dev);
-static int      smartpqi_resume(device_t dev);
-
 /*
  * PCI bus interface.
  */

Modified: head/sys/dev/smartpqi/smartpqi_prototypes.h
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_prototypes.h	Fri Jul 13 22:40:14 2018	(r336267)
+++ head/sys/dev/smartpqi/smartpqi_prototypes.h	Fri Jul 13 22:49:48 2018	(r336268)
@@ -238,21 +238,17 @@ void os_stop_heartbeat_timer(pqisrc_softstate_t *);
 void os_start_heartbeat_timer(void *);
 
 /* FreeBSD_cam.c */
-int pqisrc_scsi_setup(struct pqisrc_softstate *);
-void pqisrc_scsi_cleanup(struct pqisrc_softstate *);
 uint8_t os_get_task_attr(rcb_t *);
 void os_wellness_periodic(void *);
 void smartpqi_target_rescan(struct pqisrc_softstate *);
 
 /* FreeBSD_intr.c FreeBSD_main.c */
-void pqisrc_event_worker(void *, int);
 void os_add_device(pqisrc_softstate_t *, pqi_scsi_dev_t *);
 void os_remove_device(pqisrc_softstate_t *, pqi_scsi_dev_t *); 
 void os_io_response_success(rcb_t *);
 void os_aio_response_error(rcb_t *, aio_path_error_info_elem_t *);
 void smartpqi_adjust_queue_depth(struct cam_path *, uint32_t );
 void os_raid_response_error(rcb_t *, raid_path_error_info_elem_t *);
-void os_wellness_periodic(void *);
 void os_reset_rcb( rcb_t *);
 int register_sim(struct pqisrc_softstate *, int);
 void deregister_sim(struct pqisrc_softstate *);