pcmcia: remove unused flag, simplify headers

As we only provide one way to set up resources now, we can remove
the resource-setup-related bitfield (except resource_setup_done).
In addition, pcmcia_state only consisted of one entry, so remove
this bitfield as well.

Suggested-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 3 insertions, 15 deletions

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 66740b764da7..aeac27109839 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -162,17 +162,10 @@ struct pcmcia_socket {
         u_int                           pci_irq;
         struct pci_dev                  *cb_dev;
 
-
         /* socket setup is done so resources should be able to be allocated.
          * Only if set to 1, calls to find_{io,mem}_region are handled, and
          * insertio events are actually managed by the PCMCIA layer.*/
-        u8                              resource_setup_done:1;
-
-        /* It's old if resource setup is done using adjust_resource_info() */
-        u8                              resource_setup_old:1;
-        u8                              resource_setup_new:1;
-
-        u8                              reserved:5;
+        u8                              resource_setup_done;
 
         /* socket operations */
         struct pccard_operations        *ops;
@@ -218,13 +211,8 @@ struct pcmcia_socket {
          * incorrectness and change */
         u8                              device_count;
 
-        /* 16-bit state: */
-        struct {
-                /* the PCMCIA card consists of two pseudo devices */
-                u8                      has_pfc:1;
-
-                u8                      reserved:7;
-        } pcmcia_state;
+        /* does the PCMCIA card consist of two pseudo devices? */
+        u8                              pcmcia_pfc;
 
         /* non-zero if PCMCIA card is present */
         atomic_t                        present;