1. 12 Jun, 2003 4 commits
    • Dominik Brodowski's avatar
      [PCMCIA] Rename tcic.c socket_info_t · ea814ca7
      Dominik Brodowski authored
      Rename the socket_info_t inside tcic.c to struct tcic_socket. At one
      time there were at least five different "socket_info_t" within cardmgr
      / linux/drivers/pcmcia. Let's get rid of all of them to avoid
      confusion in future.
      ea814ca7
    • Dominik Brodowski's avatar
      [PCMCIA] rename i82365.c socket_info_t · 021830b2
      Dominik Brodowski authored
      Rename the socket_info_t inside tcic.c to struct i82365_socket. At one
      time there were at least five different "socket_info_t" within cardmgr
      / linux/drivers/pcmcia. Let's get rid of all of them to avoid
      confusion in future.
      021830b2
    • Dominik Brodowski's avatar
      [PCMCIA] i82365 depends on ISA. · 9493b334
      Dominik Brodowski authored
      The i82365 doesn't work unless CONFIG_ISA is set -- see this from
      i82365_init:
      
      ...
      
          sockets = 0;
      
      #ifdef CONFIG_ISA
          isa_probe();
      #endif
      
          if (sockets == 0) {
              printk("not found.\n");
              driver_unregister(&i82365_driver);
              return -ENODEV;
          }
      
      ...
      
      So, remove all instances of CONFIG_ISA from i82365.c and add a
      dependency to the Kconfig file.
      9493b334
    • Dominik Brodowski's avatar
      [PCMCIA] Remove socket_info_t · 91a32a40
      Dominik Brodowski authored
      Get rid of the
      
      typedef struct pcmcia_socket socket_info_t;
      
      by replacing all remaining usages of cs_internal's socket_info_t with
      struct pcmcia_socket.
      91a32a40
  2. 11 Jun, 2003 9 commits
    • Dominik Brodowski's avatar
      [PCMCIA] unify yenta.c and pci_socket.c · 5ec72d2e
      Dominik Brodowski authored
      Linus said [on April 25th of this year]:
      > There are two reasons I did pci_socket, and one of them is stale
      > and the other one is a matter of taste.
      
      As the second reason is stale now, too, unify yenta.c and
      pci_socket.c.
      5ec72d2e
    • Dominik Brodowski's avatar
      [PCMCIA] Make ds.c use pcmcia_socket->sock rather than local version. · 7e5ca9e1
      Dominik Brodowski authored
      Remove socket_no from struct pcmcia_bus_socket - it's only used in
      printks, and the one additional level of indirection doesn't hurt there.
      
       ds.c |   10 ++++------
       1 files changed, 4 insertions(+), 6 deletions(-)
      7e5ca9e1
    • Dominik Brodowski's avatar
      [PCMCIA] Replace more socket numbers with pcmcia_socket · 35f7f006
      Dominik Brodowski authored
      Replace the socket number with struct pcmcia_socket from mtd_bind_t
      and bind_req_t.
      
       drivers/pcmcia/cs.c |    4 ++--
       drivers/pcmcia/ds.c |    6 +++---
       include/pcmcia/cs.h |    4 ++--
       3 files changed, 7 insertions(+), 7 deletions(-)
      35f7f006
    • Dominik Brodowski's avatar
      [PCMCIA] socket reference in client_t · cd0966e4
      Dominik Brodowski authored
      As "socket_no" is deprecated, replace it with struct pcmcia_socket in 
      client_handle_t.
      
       bulkmem.c     |    4 ++--
       cs.c          |   22 ++++++++++------------
       cs_internal.h |    4 ++--
       3 files changed, 14 insertions(+), 16 deletions(-)
      cd0966e4
    • Russell King's avatar
    • Dominik Brodowski's avatar
      [PCMCIA] Callbacks use pcmcia_socket not integer. · b5ab04dc
      Dominik Brodowski authored
      This patch updates the callbacks to the socket drivers to take the
      corresponding struct pcmcia_socket as argument instead of the "socket
      number".
      
       drivers/pcmcia/bulkmem.c    |    6 +++---
       drivers/pcmcia/cistpl.c     |    4 ++--
       drivers/pcmcia/cs.c         |   18 +++++++++---------
       drivers/pcmcia/i82092.c     |   36 +++++++++++++++++++++++-------------
       drivers/pcmcia/i82092aa.h   |   20 ++++++++++----------
       drivers/pcmcia/i82365.c     |   34 +++++++++++++++++++++++-----------
       drivers/pcmcia/pci_socket.c |   40 ++++++++++++++++++++--------------------
       drivers/pcmcia/rsrc_mgr.c   |    2 +-
       drivers/pcmcia/tcic.c       |   35 ++++++++++++++++++-----------------
       include/pcmcia/ss.h         |   22 ++++++++++++----------
       10 files changed, 121 insertions(+), 96 deletions(-)
      b5ab04dc
    • Russell King's avatar
      [PCMCIA] Update SA11xx PCMCIA support for recent changes. · 63159f81
      Russell King authored
      Re-enable the suspend and resume methods for SA11xx PCMCIA devices,
      and update the initialisation/cleanup code for Dominik's recent
      changes.
      63159f81
    • Dominik Brodowski's avatar
      [PCMCIA] register · 9014144e
      Dominik Brodowski authored
      Add a more sane socket registration interface.
      
      Previously, it was messed up because Greg's struct class hadn't been
      invented when I wrote the code: there may be multiple sockets per
      "struct device", and there is the need for one "struct class_device"
      for each socket.
      
       drivers/pcmcia/cs.c         |  217 +++++++++++++++++++++----------------------- drivers/pcmcia/ds.c         |   56 ++---------
       drivers/pcmcia/i82092.c     |   48 ++++-----
       drivers/pcmcia/i82365.c     |   41 ++++----
       drivers/pcmcia/pci_socket.c |   23 +---
       drivers/pcmcia/pci_socket.h |    2
       drivers/pcmcia/tcic.c       |   38 ++++---
       include/pcmcia/ss.h         |   25 +++--
       8 files changed, 210 insertions(+), 240 deletions(-)
      9014144e
    • Dominik Brodowski's avatar
      [PCMCIA] split_init · 432849b8
      Dominik Brodowski authored
      Split up the socket initialization in cs.c into two pieces:
      
              pcmcia_register_socket / pcmcia_unregister_socket 
      will focus on registering sockets with the device core in future, set
      all necessary fields etc.
      
              pcmcia_add_socket / pcmcia_remove_socket 
      will use an interface to the device class "pcmcia_socket_class" in
      future, and mainly take care of what initialization cs.c needs to work
      properly.
      
      This patch is almost completely limited to shuffling code around
      
       cs.c |  157 +++++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 83 insertions(+), 74 deletions(-)
      432849b8
  3. 10 Jun, 2003 5 commits
    • Dominik Brodowski's avatar
      [PCMCIA] True driver module locking · f2931afb
      Dominik Brodowski authored
      If we use try_module_get(driver->owner) at the right place (and
      module_put as well, of course), the check for (driver->use_count > 0)
      can't ever return true. So get rid of it, and add the proper module
      locking calls.
      
       ds.c |   22 +++++++---------------
       1 files changed, 7 insertions(+), 15 deletions(-)
      f2931afb
    • Dominik Brodowski's avatar
      [PCMCIA] Remove socket_table · 07ba4cd8
      Dominik Brodowski authored
      This patch removes the socket_table from cs.c and friends.
      
       bulkmem.c     |    2 -
       cs.c          |   83 ++++++++++++++++++++++++---------------------------------- cs_internal.h |    7 ++--
       ds.c          |    2 -
       rsrc_mgr.c    |   10 ++++--
       5 files changed, 46 insertions(+), 58 deletions(-)
      07ba4cd8
    • Dominik Brodowski's avatar
      [PCMCIA] Move get_socket_info_by_nr · e9692fa4
      Dominik Brodowski authored
      This adds a list of all pcmcia sockets which will replace the current
      table-based approach. Also, ds.c now relies on cs.c to get the proper
      "struct pcmcia_bus_socket *" for the corresponding socket number.
      e9692fa4
    • Dominik Brodowski's avatar
      [PCMCIA] Move socket_info_t · b04860b1
      Dominik Brodowski authored
      This patch introduces "struct pcmcia_socket" which is 100% equal to
      the "socket_info_t" defined previously in drivers/pcmcia/cs_internal.h
      
      Unfortunately, a few other definitons need to be moved as well.
      
       drivers/pcmcia/cs.c          |    4 -
       drivers/pcmcia/cs_internal.h |   73 ---------------------------------
       include/pcmcia/ss.h          |   94 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 74 deletions(-)
      b04860b1
    • Russell King's avatar
      Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5 · 96092a79
      Russell King authored
      into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-pcmcia
      96092a79
  4. 09 Jun, 2003 18 commits
  5. 08 Jun, 2003 4 commits