media: dvb-frontends: rtl2832_sdr: don't print error when allocating urb fails

[karo-tx-linux.git] / drivers / staging / octeon / octeon-ethernet.h

diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index fdf24d120e7727052e428217d1a0f6193980534f..6275c15e0035097fb582c504dc69ca4bb09628a5 100644 (file)
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -41,20 +41,18 @@ struct octeon_ethernet {
        /* Device statistics */
        struct net_device_stats stats;
        struct phy_device *phydev;
+       unsigned int last_speed;
        unsigned int last_link;
        /* Last negotiated link state */
        u64 link_info;
        /* Called periodically to check link status */
        void (*poll)(struct net_device *dev);
        struct delayed_work     port_periodic_work;
-       struct work_struct      port_work;      /* may be unused. */
        struct device_node      *of_node;
 };
 
 int cvm_oct_free_work(void *work_queue_entry);
 
-int cvm_oct_rgmii_init(struct net_device *dev);
-void cvm_oct_rgmii_uninit(struct net_device *dev);
 int cvm_oct_rgmii_open(struct net_device *dev);
 
 int cvm_oct_sgmii_init(struct net_device *dev);
@@ -78,7 +76,6 @@ extern int pow_send_group;
 extern int pow_receive_group;
 extern char pow_send_list[];
 extern struct net_device *cvm_oct_device[];
-extern struct workqueue_struct *cvm_oct_poll_queue;
 extern atomic_t cvm_oct_poll_queue_stopping;
 extern u64 cvm_oct_tx_poll_interval;