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

Conrad Meyer cem at FreeBSD.org
Sat Apr 28 17:43:22 UTC 2018


Author: cem
Date: Sat Apr 28 17:43:20 2018
New Revision: 333085
URL: https://svnweb.freebsd.org/changeset/base/333085

Log:
  smartpqi(4): Unbreak GCC build
  
  Remove redundant declarations.

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	Sat Apr 28 13:16:58 2018	(r333084)
+++ head/sys/dev/smartpqi/smartpqi_cam.c	Sat Apr 28 17:43:20 2018	(r333085)
@@ -1199,7 +1199,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	Sat Apr 28 13:16:58 2018	(r333084)
+++ head/sys/dev/smartpqi/smartpqi_ioctl.c	Sat Apr 28 17:43:20 2018	(r333085)
@@ -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	Sat Apr 28 13:16:58 2018	(r333084)
+++ head/sys/dev/smartpqi/smartpqi_main.c	Sat Apr 28 17:43:20 2018	(r333085)
@@ -467,13 +467,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.
  */
@@ -496,5 +489,3 @@ static driver_t smartpqi_pci_driver = {
 
 DRIVER_MODULE(smartpqi, pci, smartpqi_pci_driver, pqi_devclass, 0, 0);
 MODULE_DEPEND(smartpqi, pci, 1, 1, 1);
-
-

Modified: head/sys/dev/smartpqi/smartpqi_prototypes.h
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_prototypes.h	Sat Apr 28 13:16:58 2018	(r333084)
+++ head/sys/dev/smartpqi/smartpqi_prototypes.h	Sat Apr 28 17:43:20 2018	(r333085)
@@ -131,9 +131,6 @@ int pqisrc_process_event_intr_src(pqisrc_softstate_t *
 void pqisrc_ack_all_events(void *arg);
 
 
-void pqisrc_event_worker(void *, int);
-int pqisrc_scsi_setup(struct pqisrc_softstate *);
-void pqisrc_scsi_cleanup(struct pqisrc_softstate *);
 boolean_t pqisrc_update_scsi_sense(const uint8_t *, int,
                               struct sense_header_scsi *);
 int pqisrc_build_send_raid_request(pqisrc_softstate_t *,  pqisrc_raid_req_t *,
@@ -180,7 +177,6 @@ int pqisrc_create_op_aio_ibq(pqisrc_softstate_t *, ib_
 int pqisrc_create_op_raid_ibq(pqisrc_softstate_t *, ib_queue_t *);
 int pqisrc_alloc_and_create_event_queue(pqisrc_softstate_t *);
 int pqisrc_alloc_and_create_ib_queues(pqisrc_softstate_t *);
-int pqisrc_alloc_and_create_ib_queues(pqisrc_softstate_t *);
 int pqisrc_alloc_and_create_ob_queues(pqisrc_softstate_t *);
 int pqisrc_process_task_management_response(pqisrc_softstate_t *,
                                 pqi_tmf_resp_t *);
@@ -231,10 +227,7 @@ 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 */


More information about the svn-src-head mailing list