kill sn2 inventory stubs

148 lines not on this page · raw message

@@ -329,28 +329,6 @@
 	}
 }
 
-/* Add inventory information to the widget vertex 
- * Right now (module,slot,revision) is being
- * added as inventory information.
- */
-static void
-xwidget_inventory_add(vertex_hdl_t 		widgetv,
-		      lboard_t 			*board,
-		      struct xwidget_hwid_s 	hwid)
-{
-	if (!board)
-		return;
-	/* Donot add inventory information for the baseio
-	 * on a speedo with an xbox. It has already been
-	 * taken care of in SN00_vmc.
-	 * Speedo with xbox's baseio comes in at slot io1 (widget 9)
-	 */
-	device_inventory_add(widgetv,INV_IOBD,board->brd_type,
-			     geo_module(board->brd_geoid),
-			     SLOTNUM_GETSLOT(board->brd_slot),
-			     hwid.rev_num);
-}
-
 /*
  * io_xswitch_widget_init
  *	

@@ -494,10 +472,6 @@
 		hwid.part_num = XWIDGET_PART_NUM(widget_id);
 		hwid.rev_num = XWIDGET_REV_NUM(widget_id);
 		hwid.mfg_num = XWIDGET_MFG_NUM(widget_id);
-		/* Store some inventory information about
-		 * the xwidget in the hardware graph.
-		 */
-		xwidget_inventory_add(widgetv,board,hwid);
 
 		(void)xwidget_register(&hwid, widgetv, widgetnum,
 				       hubv, hub_widgetid);

@@ -1254,24 +1254,6 @@
     hwgraph_vertex_destroy(pconn);
     
 }
-/* Add the pci card inventory information to the hwgraph
- */
-static void
-pciio_device_inventory_add(vertex_hdl_t pconn_vhdl)
-{
-    pciio_info_t	pciio_info = pciio_info_get(pconn_vhdl);
-
-    ASSERT(pciio_info);
-    ASSERT(pciio_info->c_vertex = pconn_vhdl);
-
-    /* Donot add inventory  for non-existent devices */
-    if ((pciio_info->c_vendor = PCIIO_VENDOR_ID_NONE)	||
-	(pciio_info->c_device = PCIIO_DEVICE_ID_NONE))
-	return;
-    device_inventory_add(pconn_vhdl,INV_IOBD,INV_PCIADAP,
-			 pciio_info->c_vendor,pciio_info->c_device,
-			 pciio_info->c_slot);
-}
 
 /*ARGSUSED */
 int

@@ -1283,7 +1265,6 @@
     pciio_device_id_t       device_id;
 
 
-    pciio_device_inventory_add(pconn);
     pciio_info = pciio_info_get(pconn);
 
     vendor_id = pciio_info->c_vendor;

@@ -720,28 +720,14 @@
 extern invplace_t invplace_none;
 #define INVPLACE_NONE invplace_none
 
-extern void	    add_to_inventory(int, int, int, int, int);
-extern void	    replace_in_inventory(inventory_t *, int, int, int, int, int);
-extern void         start_scan_inventory(invplace_t *);
-extern inventory_t  *get_next_inventory(invplace_t *);
-extern void         end_scan_inventory(invplace_t *);
-extern inventory_t  *find_inventory(inventory_t *, int, int, int, int, int);
-extern int	    scaninvent(int (*)(inventory_t *, void *), void *);
-extern int	    get_sizeof_inventory(int);
-
-extern void device_inventory_add(	vertex_hdl_t device, 
+static inline void device_inventory_add(vertex_hdl_t device, 
 					int class, 
 					int type, 
 					major_t ctlr, 
 					minor_t unit, 
-					int state);
-
-
-extern inventory_t *device_inventory_get_next(	vertex_hdl_t device,
-						invplace_t *);
+					int state)
+{
+}
 
-extern void device_controller_num_set(	vertex_hdl_t,
-					int);
-extern int device_controller_num_get(	vertex_hdl_t);
 #endif /* __KERNEL__ */
 #endif /* _ASM_IA64_SN_INVENT_H */