From: "Dr. David Alan Gilbert" <linux@treblig.org>

The last use of pcmcia_get_socket_by_nr() was removed in 2010 by
commit 5716d415f8c5 ("pcmcia: remove obsolete ioctl")

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 drivers/pcmcia/cs.c          | 17 -----------------
 drivers/pcmcia/cs_internal.h |  1 -
 2 files changed, 18 deletions(-)

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index c75f55e1250a..adbc486af2ea 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -229,23 +229,6 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
 EXPORT_SYMBOL(pcmcia_unregister_socket);
 
 
-struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr)
-{
-	struct pcmcia_socket *s;
-
-	down_read(&pcmcia_socket_list_rwsem);
-	list_for_each_entry(s, &pcmcia_socket_list, socket_list)
-		if (s->sock == nr) {
-			up_read(&pcmcia_socket_list_rwsem);
-			return s;
-		}
-	up_read(&pcmcia_socket_list_rwsem);
-
-	return NULL;
-
-}
-EXPORT_SYMBOL(pcmcia_get_socket_by_nr);
-
 static int socket_reset(struct pcmcia_socket *skt)
 {
 	int status, i;
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 02a83ca44e77..5ac810ffda31 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -116,7 +116,6 @@ extern struct list_head pcmcia_socket_list;
 extern const struct class pcmcia_socket_class;
 
 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
-struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);
 
 void pcmcia_parse_uevents(struct pcmcia_socket *socket, unsigned int events);
 #define PCMCIA_UEVENT_EJECT	0x0001
-- 
2.48.1

Am Mon, Mar 03, 2025 at 01:01:25AM +0000 schrieb linux@treblig.org:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
> 
> The last use of pcmcia_get_socket_by_nr() was removed in 2010 by
> commit 5716d415f8c5 ("pcmcia: remove obsolete ioctl")
> 
> Remove it.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

Thanks for the catch! Applied to pcmcia-next.

Best,
	Dominik


> ---
>  drivers/pcmcia/cs.c          | 17 -----------------
>  drivers/pcmcia/cs_internal.h |  1 -
>  2 files changed, 18 deletions(-)
> 
> diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
> index c75f55e1250a..adbc486af2ea 100644
> --- a/drivers/pcmcia/cs.c
> +++ b/drivers/pcmcia/cs.c
> @@ -229,23 +229,6 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
>  EXPORT_SYMBOL(pcmcia_unregister_socket);
>  
>  
> -struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr)
> -{
> -	struct pcmcia_socket *s;
> -
> -	down_read(&pcmcia_socket_list_rwsem);
> -	list_for_each_entry(s, &pcmcia_socket_list, socket_list)
> -		if (s->sock == nr) {
> -			up_read(&pcmcia_socket_list_rwsem);
> -			return s;
> -		}
> -	up_read(&pcmcia_socket_list_rwsem);
> -
> -	return NULL;
> -
> -}
> -EXPORT_SYMBOL(pcmcia_get_socket_by_nr);
> -
>  static int socket_reset(struct pcmcia_socket *skt)
>  {
>  	int status, i;
> diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
> index 02a83ca44e77..5ac810ffda31 100644
> --- a/drivers/pcmcia/cs_internal.h
> +++ b/drivers/pcmcia/cs_internal.h
> @@ -116,7 +116,6 @@ extern struct list_head pcmcia_socket_list;
>  extern const struct class pcmcia_socket_class;
>  
>  int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
> -struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);
>  
>  void pcmcia_parse_uevents(struct pcmcia_socket *socket, unsigned int events);
>  #define PCMCIA_UEVENT_EJECT	0x0001
> -- 
> 2.48.1
> 
>