leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ieee1394: dv1394: tidy up card removal

Browse Source 
small coding style touch-up and terser coding

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2007-01-27 13:54:23 +01:00
parent 88e7bf2a4c
commit 12ba145c94
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/ieee1394/dv1394.c
View File

@ -2255,47 +2255,37 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
return 0;
}
static void dv1394_un_init(struct video_card *video)
static void dv1394_remove_host(struct hpsb_host *host)
{
/* obviously nobody has the driver open at this point */
do_dv1394_shutdown(video, 1);
kfree(video);
}
static void dv1394_remove_host (struct hpsb_host *host)
{
struct video_card *video;
struct video_card *video, *tmp_video;
unsigned long flags;
int id = host->id, found_ohci_card = 0;
int found_ohci_card = 0;
/* find the corresponding video_cards */
do {
struct video_card *tmp_vid;
video = NULL;
spin_lock_irqsave(&dv1394_cards_lock, flags);
list_for_each_entry(tmp_vid, &dv1394_cards, list) {
if ((tmp_vid->id >> 2) == id) {
list_del(&tmp_vid->list);
video = tmp_vid;
list_for_each_entry(tmp_video, &dv1394_cards, list) {
if ((tmp_video->id >> 2) == host->id) {
list_del(&tmp_video->list);
video = tmp_video;
found_ohci_card = 1;
break;
}
}
spin_unlock_irqrestore(&dv1394_cards_lock, flags);
if (video)
dv1394_un_init(video);
} while (video != NULL);
if (video) {
do_dv1394_shutdown(video, 1);
kfree(video);
}
} while (video);
if (found_ohci_card)
class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2)));
}
static void dv1394_add_host (struct hpsb_host *host)
static void dv1394_add_host(struct hpsb_host *host)
{
struct ti_ohci *ohci;
int id = host->id;